Changeset c1832da for BOOK/temp-system/multilib

Timestamp:

Jan 17, 2009, 11:58:17 AM (15 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

95de45a

Parents:

0defd7d

Message:

Ryan's Toolchain Update

File:

• BOOK/temp-system/multilib/gcc.xml (moved) (moved from BOOK/temp-system/x86_64/gcc.xml) (3 diffs)

BOOK/temp-system/multilib/gcc.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -62 +54 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <para os="da">When searching for the multilibs, force the build to use the
-    results of <option>--print-multi-lib</option> from our cross-compiler,
-    not the native compiler <command>gcc</command> builds now:</para>
-
-<screen os="db"><userinput>cp -v gcc/Makefile.in{,.orig2}
-sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" \
-   gcc/Makefile.in.orig2 &gt; gcc/Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -88 +72 @@
 
 <screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-long-long --enable-c99 \
-    --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+  ../gcc-&gcc-version;/configure --prefix=/tools \
+  --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+  --target=${CLFS_TARGET} --with-sysroot=${CLFS} --with-local-prefix=/tools \
+  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
+  --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
+  --disable-libstdcxx-pch</userinput></screen>
 
     <variablelist os="dd">