r6651 - in branches/cross-lfs/BOOK/temp-system: mips64-64 sparc64-64 x86_64-64

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Aug 11 12:42:23 PDT 2005


Author: manuel
Date: 2005-08-11 13:42:23 -0600 (Thu, 11 Aug 2005)
New Revision: 6651

Modified:
   branches/cross-lfs/BOOK/temp-system/mips64-64/gcc.xml
   branches/cross-lfs/BOOK/temp-system/sparc64-64/gcc.xml
   branches/cross-lfs/BOOK/temp-system/x86_64-64/gcc.xml
Log:
Xinclude stuff on temp-system pure64 GCC files.

Modified: branches/cross-lfs/BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/mips64-64/gcc.xml	2005-08-11 18:46:10 UTC (rev 6650)
+++ branches/cross-lfs/BOOK/temp-system/mips64-64/gcc.xml	2005-08-11 19:42:23 UTC (rev 6651)
@@ -44,84 +44,88 @@
     <title>Installation of GCC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../../cross-tools/mips64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../../cross-tools/mips64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../cross-tools/mips64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../cross-tools/mips64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    href="../../cross-tools/mips64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    href="../../cross-tools/mips64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='cd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='cf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[7])"/>
+    xpointer="xpointer(//*[@os='ch'])"/>
 
-<screen><userinput>sed -i "s@\./xgcc@/cross-tools/bin/${CC}@g" \
-   gcc/mklibgcc.in</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='ci'])"/>
 
-    <para>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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
 
-<screen><userinput>sed -i \
-"/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" gcc/Makefile.in</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/important[1])"/>
+    href="../../cross-tools/mips64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ak'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(id('install-gcc')/para[4])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(id('install-gcc')/screen[3])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[9])"/>
+    xpointer="xpointer(//*[@os='cj'])"/>
 
-    <para>Now prepare GCC for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
@@ -147,10 +151,6 @@
         </listitem>
       </varlistentry>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../x86/gcc.xml"
-      xpointer="xpointer(//*[@role='installation']//*/varlistentry[2])"/>
-
     </variablelist>
 
     <para>Compile the package:</para>
@@ -161,15 +161,17 @@
 
 <screen><userinput>make install</userinput></screen>
 
-   <para>Now we will move some libraries that were created in <filename>/tools/lib64</filename>
-   to <filename>/tools/lib</filename>. Then we will remove the <filename>/tools/lib64</filename>
-   directory.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='ea'])"/>
 
-<screen><userinput>mv /tools/lib64/* /tools/lib
-rm -rf /tools/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='eb'])"/>
 
-    <para>Many packages use the name <command>cc</command> to call the C
-    compiler. To satisfy those packages, create a symlink:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
 
 <screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/temp-system/sparc64-64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/sparc64-64/gcc.xml	2005-08-11 18:46:10 UTC (rev 6650)
+++ branches/cross-lfs/BOOK/temp-system/sparc64-64/gcc.xml	2005-08-11 19:42:23 UTC (rev 6651)
@@ -44,85 +44,88 @@
     <title>Installation of GCC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../../cross-tools/sparc64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../../cross-tools/sparc64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../cross-tools/sparc64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../cross-tools/sparc64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    href="../../cross-tools/sparc64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    href="../../cross-tools/sparc64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='cd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='cf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[7])"/>
+    xpointer="xpointer(//*[@os='ch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[7])"/>
+    xpointer="xpointer(//*[@os='ci'])"/>
 
-    <para>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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
 
-<screen><userinput>sed -i \
-"/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" gcc/Makefile.in</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/important[1])"/>
+    href="../../cross-tools/sparc64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ak'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(id('install-gcc')/para[4])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(id('install-gcc')/screen[3])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[9])"/>
+    xpointer="xpointer(//*[@os='cj'])"/>
 
-    <para>Now prepare GCC for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib  \
@@ -131,10 +134,6 @@
     --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
-
     <para>Compile the package:</para>
 
 <screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" </userinput></screen>
@@ -143,15 +142,17 @@
 
 <screen><userinput>make install</userinput></screen>
 
-   <para>Now we will move some libraries that were created in <filename>/tools/lib64</filename>
-   to <filename>/tools/lib</filename>. Then we will remove the <filename>/tools/lib64</filename>
-   directory.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='ea'])"/>
 
-<screen><userinput>mv /tools/lib64/* /tools/lib
-rm -rf /tools/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='eb'])"/>
 
-    <para>Many packages use the name <command>cc</command> to call the C
-    compiler. To satisfy those packages, create a symlink:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
 
 <screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/temp-system/x86_64-64/gcc.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/x86_64-64/gcc.xml	2005-08-11 18:46:10 UTC (rev 6650)
+++ branches/cross-lfs/BOOK/temp-system/x86_64-64/gcc.xml	2005-08-11 19:42:23 UTC (rev 6651)
@@ -44,78 +44,89 @@
     <title>Installation of GCC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../../cross-tools/x86_64-64/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"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../../cross-tools/x86_64-64/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"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../cross-tools/x86_64-64/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"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../cross-tools/x86_64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    href="../../cross-tools/x86_64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    href="../../cross-tools/x86_64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='cd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='cf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[7])"/>
+    xpointer="xpointer(//*[@os='ch'])"/>
 
-    <para>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>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='ci'])"/>
 
-<screen><userinput>sed -i \
-"/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" gcc/Makefile.in</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@role='installation']/important[1])"/>
+    href="../x86_64/gcc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/x86_64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ak'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(id('install-gcc')/para[4])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(id('install-gcc')/screen[3])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-  <para>Now prepare GCC for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cj'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
 <screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
@@ -123,10 +134,6 @@
     --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/gcc.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
-
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
@@ -135,15 +142,17 @@
 
 <screen><userinput>make install</userinput></screen>
 
-   <para>Now we will move some libraries that were created in <filename>/tools/lib64</filename>
-   to <filename>/tools/lib</filename>. Then we will remove the <filename>/tools/lib64</filename>
-   directory.</para>
+   <para os="ea">Now we will move some libraries that were created in
+   <filename class="directory">/tools/lib64</filename> to <filename
+   class="directory">/tools/lib</filename>. Then we will remove the <filename
+   class="directory">/tools/lib64</filename> directory.</para>
 
-<screen><userinput>mv /tools/lib64/* /tools/lib
+<screen os="eb"><userinput>mv /tools/lib64/* /tools/lib
 rm -rf /tools/lib64</userinput></screen>
 
-    <para>Many packages use the name <command>cc</command> to call the C
-    compiler. To satisfy those packages, create a symlink:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
 
 <screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
 




More information about the lfs-book mailing list