Changeset 76b06f6 for BOOK/cross-tools/common/gcc-static.xml

Timestamp:

Sep 24, 2013, 11:53:17 AM (11 years ago)

Author:

William Harrington <kb0iic@…>

Children:

2e9ccbe

Parents:

111b12a

Message:

Prepare for CLFS-2.0.0 release.

File:

• BOOK/cross-tools/common/gcc-static.xml (modified) (5 diffs)

BOOK/cross-tools/common/gcc-static.xml

@@ -24 +24 @@
     and no Threads</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    <para os="p1">The following patch contains a number of updates to the
+    &gcc-version; branch by the GCC developers:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
 
     <para os="aa">Make a couple of essential adjustments to the
@@ -38 +35 @@
 <screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
 
-    <para os="ag">Change the StartFile Spec so that GCC looks in 
-<filename class="directory">/tools</filename>:</para>
+    <para os="ag">Change the StartFile Spec and Standard Include Dir so that
+    GCC looks in <filename class="directory">/tools</filename>:</para>
 
-<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
+<screen os="ah"><userinput>echo -en '#undef STANDARD_INCLUDE_DIR\n#define STANDARD_INCLUDE_DIR "/tools/include/"\n\n' >> gcc/config/linux.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
 echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h</userinput></screen>
+
+    <para os="ai">Now alter <command>gcc</command>'s c preprocessor's default
+    include search path to use <filename class="directory">/tools</filename> only:</para>
+
+<screen os="aj"><userinput>cp -v gcc/Makefile.in{,.orig}
+sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
+    gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
 
     <para os="t1">We will create a dummy <filename>limits.h</filename> so
@@ -64 +69 @@
   ../gcc-&gcc-version;/configure --prefix=/cross-tools \
   --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS} --with-local-prefix=/tools \
-  --with-native-system-header-dir=/tools/include --disable-nls \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
   --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-  --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
-  --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
-  --disable-libmudflap --disable-libssp --disable-threads --disable-multilib \
-  --disable-libatomic --disable-libitm --disable-libsanitizer \
-  --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
-  --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
-  --enable-languages=c --enable-checking=release</userinput></screen>
+  --with-ppl=/cross-tools --with-cloog=/cross-tools --without-headers \
+  --with-newlib --disable-decimal-float --disable-libgomp \
+  --disable-libmudflap --disable-libssp --disable-threads \
+  --enable-languages=c --disable-multilib --enable-cloog-backend=isl</userinput></screen>
 
     <variablelist os="am">
@@ -96 +97 @@
       </varlistentry>
 
-
-      <varlistentry>
-        <term><parameter>--with-native-system-headers-dir=/tools/include</parameter></term>
-        <listitem>
-          <para>This switch ensures that GCC will search for the system headers
-           in <filename class="directory">/tools/include</filename> and that
-           host system headers will not be searched.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>--disable-nls</parameter></term>
         <listitem>
-          <para>This disables internationalization as i18n is not needed for the
+          <para>This disables internationalization as i18n is not needed for the 
           cross-compile tools.</para>
         </listitem>
@@ -167 +158 @@
 
       <varlistentry>
-        <term><parameter>--disable-libatomic</parameter></term>
-        <listitem>
-          <para>The atomic library isn't needed at this time.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-libitm</parameter></term>
-        <listitem>
-          <para>The itm library isn't neeeded at this tiem.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-libsanitizer</parameter></term>
-        <listitem>
-          <para>The sanitizer library isn't needed at this time.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-libquadmath</parameter></term>
-        <listitem>
-          <para>The quadmath library isn't needed at this time.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--enable-languages=c</parameter></term>
         <listitem>
           <para>This option ensures that only the C compiler is built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-checking=release</parameter></term>
-        <listitem>
-          <para>This option selects the complexity of the internal consistency checks and adds error checking within the compiler.</para>
         </listitem>
       </varlistentry>