r897 - in trunk/BOOK: . cross-tools cross-tools/common cross-tools/mips cross-tools/mips64 cross-tools/mips64-64 cross-tools/ppc cross-tools/sparc64 cross-tools/sparc64-64 cross-tools/sparcv8 cross-tools/x86 cross-tools/x86_64 cross-tools/x86_64-64 introduction/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Dec 14 21:23:25 PST 2005


Author: jim
Date: 2005-12-14 22:23:24 -0700 (Wed, 14 Dec 2005)
New Revision: 897

Added:
   trunk/BOOK/cross-tools/mips/variables.xml
   trunk/BOOK/cross-tools/mips64-64/variables.xml
   trunk/BOOK/cross-tools/mips64/variables.xml
   trunk/BOOK/cross-tools/ppc/variables.xml
   trunk/BOOK/cross-tools/sparc64-64/variables.xml
   trunk/BOOK/cross-tools/sparc64/variables.xml
   trunk/BOOK/cross-tools/sparcv8/variables.xml
   trunk/BOOK/cross-tools/x86/variables.xml
   trunk/BOOK/cross-tools/x86_64-64/variables.xml
   trunk/BOOK/cross-tools/x86_64/variables.xml
Removed:
   trunk/BOOK/cross-tools/common/variables-multilib.xml
   trunk/BOOK/cross-tools/common/variables.xml
Modified:
   trunk/BOOK/
   trunk/BOOK/cross-tools/alpha-chapter.xml
   trunk/BOOK/cross-tools/mips-chapter.xml
   trunk/BOOK/cross-tools/mips64-64-chapter.xml
   trunk/BOOK/cross-tools/mips64-chapter.xml
   trunk/BOOK/cross-tools/mips64/flags.xml
   trunk/BOOK/cross-tools/ppc-chapter.xml
   trunk/BOOK/cross-tools/sparc-chapter.xml
   trunk/BOOK/cross-tools/sparc64-64-chapter.xml
   trunk/BOOK/cross-tools/sparc64-chapter.xml
   trunk/BOOK/cross-tools/sparc64/flags.xml
   trunk/BOOK/cross-tools/sparcv8-chapter.xml
   trunk/BOOK/cross-tools/x86-chapter.xml
   trunk/BOOK/cross-tools/x86_64-64-chapter.xml
   trunk/BOOK/cross-tools/x86_64-chapter.xml
   trunk/BOOK/cross-tools/x86_64/flags.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
 r1069 at server:  jim | 2005-12-14 21:21:50 -0800
 Changing how we set LFS_HOST, LFS_TARGET, and LFS_TARGET32



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1067
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1069
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/cross-tools/alpha-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/alpha-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/alpha-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/glibc-headers.xml"/>

Deleted: trunk/BOOK/cross-tools/common/variables-multilib.xml
===================================================================
--- trunk/BOOK/cross-tools/common/variables-multilib.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/common/variables-multilib.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Configuration # 1 - Creating different
-  architecture tools</bridgehead>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='b'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='d'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='e'])"/>
-
-  <bridgehead renderas="sect4">Configuration # 2 - Creating same
-  architecture tools</bridgehead>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
-	
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='j'])"/>
-
-  <bridgehead renderas="sect4">Sanity Check</bridgehead>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='k'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='l'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='m'])"/>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-  <para os="n">Now we will add ${LFS_TARGET} to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later: We will add ${LFS_HOST} after
-  it performs another sanity check in the next section</para>
-
-<screen os="o"><userinput>echo export LFS_TARGET=\""${LFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../common/variables.xml"
-     xpointer="xpointer(//*[@os='p'])"/>
-
-</sect1>
-

Deleted: trunk/BOOK/cross-tools/common/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/common/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/common/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Configuration # 1 - Creating different
-  architecture tools</bridgehead>
-
-  <para os="a">This method is recommended for all LiveCD based distro's.</para>
-
-  <para os="b">During the building of the cross-compile tools you will need to
-  set a few variables that will be dependent on your particular needs.
-  The first variable will be the triplet of the <envar>HOST</envar> machine.
-  You will need to set the <envar>CHOST</envar> triplet to match your
-  particular needs. To set this information you can issue the following
-  command:</para>
-
-<screen os="c"><userinput>export LFS_HOST="${MACHTYPE}"</userinput></screen>
-
-  <para os="d">Now you will need to set the target triplet for the target
-  architecture. You can do this by running the same command as above, just
-  running it on the target machine. If you can't run the command on the
-  target machine, you can use the table at the bottom of this page. Set
-  the command using the method listed below:</para>
-
-<screen os="e"><userinput>export LFS_TARGET="{target triplet}"</userinput></screen>
-
-  <bridgehead renderas="sect4">Configuration # 2 - Creating same
-  architecture tools</bridgehead>
-
-  <para os="f">You can also create <quote>clean</quote> tools on your current
-  distro. This will ensure that you have all the prerequisites for the
-  LFS build.</para>
-
-  <para os="g">You will need to set your host target triplet a little differently.
-  To set this information you can issue the following commands:</para>
-
-<screen os="h"><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
-
-  <para os="i">Now you will need to set the target triplet for the target, which
-  in this case is very simple. Set the command using the method listed
-  below:</para>
-
-<screen os="j"><userinput>export LFS_TARGET="${MACHTYPE}"</userinput></screen>
-
-  <bridgehead renderas="sect4">Sanity Check</bridgehead>
-
-  <para os="k">Let's perform a sanity check to prevent build issues. If our LFS_HOST matches our
-  target, we will get some failures during our cross-compile:</para>
-
-<screen os="l"><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET}" ]; then \
-  echo "Host and Target can't be the same." ; fi</userinput></screen>
- 
-  <para os="m">If you received an message, "Host and Target can't be the same."
-  You will need to use the other Configuration Method. This will prevent build
-  issues during the early phases of the build.</para>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-  <para os="n">Now we will add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
-
-<screen os="o"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" >> ~/.bashrc
-echo export LFS_TARGET=\""${LFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
-
-  <table os="p">
-    <title>List of architectures, target triplets, and recommended book</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Triplet"/>
-      <colspec colname="Book"/>
-      <thead>
-        <row>
-          <entry>Architecture</entry>
-          <entry>Target Triplet</entry>
-          <entry>32 Bit, 64 Bit, 32/64 Bit</entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry>Pentium, K6, 586 Compatibles</entry>
-          <entry>i586-pc-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Pentium II, Pentium III, Pentium 4</entry>
-          <entry>i686-pc-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Athlon, Duron</entry>
-          <entry>i686-pc-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Athlon64</entry>
-          <entry>x86_64-pc-linux-gnu</entry>
-          <entry>32/64 Bit</entry>
-        </row>
-        <row>
-          <entry>PowerPC</entry>
-          <entry>powerpc-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>PowerPC64</entry>
-          <entry>ppc64-unknown-linux-gnu</entry>
-          <entry>64 Bit</entry>
-        </row>
-        <row>
-          <entry>MIPS</entry>
-          <entry>mips-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>MIPS Little Endian</entry>
-          <entry>mipsel-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>MIPS 64</entry>
-          <entry>mips64-unknown-linux-gnu</entry>
-          <entry>64 Bit</entry>
-        </row>
-        <row>
-          <entry>MIPS 64 Little Endian</entry>
-          <entry>mips64el-unknown-linux-gnu</entry>
-          <entry>64 Bit</entry>
-        </row>
-        <row>
-          <entry>Cypress</entry>
-          <entry>sparc-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Supersparc and Hypersparc</entry>
-          <entry>sparc-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc</entry>
-          <entry>sparc64-unknown-linux-gnu</entry>
-          <entry>32/64 Bit</entry>
-        </row>
-        <row>
-          <entry>Alpha</entry>
-          <entry>alpha-unknown-linux-gnu</entry>
-          <entry>64 Bit</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </table>
-
-</sect1>

Added: trunk/BOOK/cross-tools/mips/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/mips/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/mips/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <para os="aa">For a MIPS Little Endian Machine:</para>
+
+<screen os="ab"><userinput>export LFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
+
+    <para os="ac">For a MIPS Big Endian Machine:</para>
+
+<screen os="ad"><userinput>export LFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>

Modified: trunk/BOOK/cross-tools/mips-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/mips-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/mips-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-static.xml"/>

Modified: trunk/BOOK/cross-tools/mips64/flags.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/flags.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/mips64/flags.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -22,32 +22,8 @@
      href="../x86_64/flags.xml"
      xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET32="`echo ${LFS_TARGET}| sed -e 's/64//g'`"</userinput></screen>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../x86_64/flags.xml"
-     xpointer="xpointer(//*[@os='e'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../x86_64/flags.xml"
-     xpointer="xpointer(//*[@os='f'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../x86_64/flags.xml"
-     xpointer="xpointer(//*[@os='g'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../x86_64/flags.xml"
-     xpointer="xpointer(//*[@os='h'])"/>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../x86_64/flags.xml"
-     xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bashrc
+<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bashrc
 echo export BUILDN32=\""${BUILDN32}\"" >> ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" >> ~/.bashrc
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bashrc
-echo export LFS_HOST=\""${LFS_HOST}\"" >> ~/.bashrc</userinput></screen>
+echo export BUILD64=\""${BUILD64}\"" >> ~/.bashrc</userinput></screen>
 
 </sect1>

Added: trunk/BOOK/cross-tools/mips64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/mips64/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>export LFS_TARGET32="`echo ${LFS_TARGET}| sed -e 's/64//g'`"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>

Added: trunk/BOOK/cross-tools/mips64-64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64-64/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/mips64-64/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+<screen os="ab"><userinput>export LFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+<screen os="ad"><userinput>export LFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>

Modified: trunk/BOOK/cross-tools/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64-64-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/mips64-64-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>

Modified: trunk/BOOK/cross-tools/mips64-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/mips64-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/mips64-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables-multilib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>

Added: trunk/BOOK/cross-tools/ppc/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/ppc/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export LFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>

Modified: trunk/BOOK/cross-tools/ppc-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/ppc-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/ppc-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/gcc-static.xml"/>

Modified: trunk/BOOK/cross-tools/sparc-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/sparc-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-static.xml"/>

Modified: trunk/BOOK/cross-tools/sparc64/flags.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64/flags.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/sparc64/flags.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -21,38 +21,14 @@
    href="../x86_64/flags.xml"
    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>export LFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64/flags.xml"
-   xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64/flags.xml"
-   xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64/flags.xml"
-   xpointer="xpointer(//*[@os='g'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64/flags.xml"
-   xpointer="xpointer(//*[@os='h'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64/flags.xml"
-   xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bashrc
+<screen os="f"><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bashrc
 echo export BUILD64=\""${BUILD64}\"" >> ~/.bashrc
-echo export GCCTARGET=\""${GCCTARGET}\"" >> ~/.bashrc
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bashrc
-echo export LFS_HOST=\""${LFS_HOST}\"" >> ~/.bashrc</userinput></screen>
+echo export GCCTARGET=\""${GCCTARGET}\"" >> ~/.bashrc</userinput></screen>
 
-  <para os="k">The following table gives the entires for different Sparc 64 capable
+  <para os="d">The following table gives the entires for different Sparc 64 capable
   processors. Pick the processor that matches your system.</para>
 
-  <table os="l">
+  <table os="e">
     <title>List of architectures, target triplets, and recommended book</title>
     <tgroup cols="2" align="center">
       <colspec colname="Processor"/>

Added: trunk/BOOK/cross-tools/sparc64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/sparc64/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export LFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>export LFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>

Added: trunk/BOOK/cross-tools/sparc64-64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64-64/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/sparc64-64/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc64/variables.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>

Modified: trunk/BOOK/cross-tools/sparc64-64-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64-64-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/sparc64-64-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/binutils.xml"/>

Modified: trunk/BOOK/cross-tools/sparc64-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc64-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/sparc64-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables-multilib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/binutils.xml"/>

Added: trunk/BOOK/cross-tools/sparcv8/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/sparcv8/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/sparcv8/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export LFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>

Modified: trunk/BOOK/cross-tools/sparcv8-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/sparcv8-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/sparcv8-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-static.xml"/>

Added: trunk/BOOK/cross-tools/x86/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/x86/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+  <para os="a">During the building of the cross-compile tools you will need to
+  set a few variables that will be dependent on your particular needs.
+  The first variable will be the triplet of the <envar>HOST</envar> machine.
+  You will need to set the <envar>CHOST</envar> triplet to match your
+  particular needs. To set this information you can issue the following
+  command:</para>
+
+<screen os="b"><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
+
+  <para os="c">Now you will need to set the target triplet for the target
+  architecture. You can do this by running the same command as above, just
+  running it on the target machine. If you can't run the command on the
+  target machine, you can use the table at the bottom of this page. Set
+  the command using the method listed below:</para>
+
+<screen os="d"><userinput>export LFS_TARGET="{target triplet}"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+  <para os="e">Now we will add these to <filename>~/.bashrc</filename>, just in
+  case you have to exit and restart building later:</para>
+
+<screen os="f"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" >> ~/.bashrc
+echo export LFS_TARGET=\""${LFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
+
+  <table os="g">
+    <title>Processor Type and  Target Triplets</title>
+    <tgroup cols="2" align="center">
+      <colspec colname="Processor"/>
+      <colspec colname="Triplet"/>
+      <thead>
+        <row>
+          <entry>Processor</entry>
+          <entry>Target Triplet</entry>
+        </row>
+      </thead>
+      <tbody>
+        <row>
+          <entry>486 Compatibles</entry>
+          <entry>i486-pc-linux-gnu</entry>
+        </row>
+        <row>
+          <entry>Pentium, K6, 586 Compatibles</entry>
+          <entry>i586-pc-linux-gnu</entry>
+        </row>
+        <row>
+          <entry>Pentium II, Pentium III, Pentium 4</entry>
+          <entry>i686-pc-linux-gnu</entry>
+        </row>
+        <row>
+          <entry>Athlon, Duron</entry>
+          <entry>i686-pc-linux-gnu</entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </table>
+
+</sect1>

Modified: trunk/BOOK/cross-tools/x86-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/x86-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/x86-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/glibc-headers.xml"/>

Modified: trunk/BOOK/cross-tools/x86_64/flags.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/flags.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/x86_64/flags.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -16,27 +16,10 @@
 <screen os="b"><userinput>export BUILD32="-m32"
 export BUILD64="-m64"</userinput></screen>
 
-  <para os="c">You will need to set your host target triplet for 32 bits:</para>
-
-<screen os="d"><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
-
-  <para os="e">Let's perform a sanity check to prevent build issues. If our LFS_HOST matches our
-  target, we will get some failures during our cross-compile:</para>
-
-<screen os="f"><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET32}" ]; then \
-  echo "Host and Target can't be the same." ; fi</userinput></screen>
-
-  <para os="g">If the above test gave you "Host and Target can't be the same", you will need to change your LFS_HOST to a
-  a different target triplet:</para>
-
-<screen os="h"><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
-
-  <para os="i">Lets add the build flags to <filename>~/.bashrc</filename> to
+  <para os="c">Lets add the build flags to <filename>~/.bashrc</filename> to
   prevent issues if we stop and come back later.</para>
 
-<screen os="j"><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" >> ~/.bashrc
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bashrc
-echo export LFS_HOST=\""${LFS_HOST}\"" >> ~/.bashrc</userinput></screen>
+<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" >> ~/.bashrc
+echo export BUILD64=\""${BUILD64}\"" >> ~/.bashrc</userinput></screen>
 
 </sect1>

Added: trunk/BOOK/cross-tools/x86_64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/x86_64/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+  <para os="c">Now we will set our Target Triplet:</para>
+
+<screen os="d"><userinput>export LFS_TARGET="x86_64-pc-linux-gnu"</userinput></screen>
+
+  <para os="m1">Now we will set our Target Triplet for 32 Bits:</para>
+
+<screen os="m2"><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" >> ~/.bashrc
+echo export LFS_TARGET=\""${LFS_TARGET}\"" >> ~/.bashrc
+echo export LFS_TARGET32=\""${LFS_TARGET32}\"" >> ~/.bashrc</userinput></screen>
+
+</sect1>

Added: trunk/BOOK/cross-tools/x86_64-64/variables.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64-64/variables.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/x86_64-64/variables.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>

Modified: trunk/BOOK/cross-tools/x86_64-64-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64-64-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/x86_64-64-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -14,7 +14,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/glibc-headers.xml"/>

Modified: trunk/BOOK/cross-tools/x86_64-chapter.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64-chapter.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/cross-tools/x86_64-chapter.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables-multilib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-12-14 17:43:50 UTC (rev 896)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-12-15 05:23:24 UTC (rev 897)
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>December 14, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Change the LFS_HOST and LFS_TARGET pages to prevent
+	  further build issues.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 13, 2005</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list