Changes in BOOK/temp-system/common/gcc.xml [cc858ed:e05c4f0]

File:

• BOOK/temp-system/common/gcc.xml (modified) (4 diffs)

BOOK/temp-system/common/gcc.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
+    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
+    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
@@ -47 +47 @@
     xpointer="xpointer(//*[@os='ah'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
+    <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>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
+<screen os="cg"><userinput>cp -v gcc/Makefile.in{,.orig}
+sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
+    gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -72 +71 @@
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
   --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-  --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-  --enable-c99 --enable-shared --enable-threads=posix --disable-multilib \
-  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
-  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
-  --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
-  --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
-  --with-native-system-header-dir=/tools/include --disable-libssp \
-  --disable-install-libiberty --enable-checking=release \
-  --enable-libstdcxx-time</userinput></screen>
+  --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>
 
     <variablelist os="cl">
@@ -96 +90 @@
     </variablelist>
 
-    <para os="s1">The following will prevent GCC from looking in the wrong
+    <para os="ts1">The following will prevent GCC from looking in the wrong
     directories for headers and libraries:</para>
 
-<screen os="s2"><userinput>cp -v Makefile{,.orig}
-sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:/tools:/cross-tools:g" \
-    Makefile.orig > Makefile</userinput></screen>
+<screen os="ts2"><userinput>cp -v Makefile{,.orig}
+sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
+    Makefile.orig &gt; Makefile</userinput></screen>
 
     <para os="cm">Compile the package:</para>