Changeset 384af06 for BOOK

Timestamp:

Jan 19, 2009, 12:45:25 PM (16 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:

0ce8bf5

Parents:

7352c10

Message:

Toolchain Fixes

Location:

BOOK/temp-system

Files:

• 64/binutils.xml (modified) (1 diff)
• 64/gcc.xml (modified) (1 diff)
• common/binutils.xml (modified) (1 diff)
• common/gcc.xml (modified) (2 diffs)
• mips64/gcc.xml (modified) (2 diffs)
• multilib/binutils.xml (modified) (1 diff)
• multilib/gcc.xml (modified) (2 diffs)

BOOK/temp-system/64/binutils.xml

@@ -52 +52 @@
 
 <screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-version;/configure \
-    --prefix=/tools --with-sysroot=${CLFS} --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --disable-nls --enable-shared --enable-64-bit-bfd \
-    --disable-multilib</userinput></screen>
+    --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} --disable-nls --enable-shared \
+    --enable-64-bit-bfd --disable-multilib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/64/gcc.xml

@@ -46 +46 @@
     href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/common/binutils.xml

@@ -53 +53 @@
 <screen os="j"><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} --disable-nls --enable-shared \
-    --disable-multilib</userinput></screen>
+    --disable-nls --enable-shared --disable-multilib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/common/gcc.xml

@@ -47 +47 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
+
     <para os="cf">Also, we need to set the directory searched by the fixincludes
     process for system headers, so it won't look at the host's headers:</para>
@@ -71 +79 @@
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
   --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 \
+  --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 \
   --disable-multilib</userinput></screen>

BOOK/temp-system/mips64/gcc.xml

@@ -48 +48 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cf'])"/>
@@ -74 +82 @@
   ../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 \
+  --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 --with-abi=64</userinput></screen>

BOOK/temp-system/multilib/binutils.xml

@@ -61 +61 @@
 <screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-version;/configure \
     --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib \
-    --with-sysroot=${CLFS} --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
+    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
     <variablelist os="ea">

BOOK/temp-system/multilib/gcc.xml

@@ -48 +48 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cf'])"/>
@@ -74 +82 @@
   ../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 \
+  --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>