Changeset 9dc5852 in clfs-embedded for BOOK/cross-tools

Timestamp:

Aug 16, 2008, 4:32:01 AM (16 years ago)

Author:

Maarten Lankhorst <m.b.lankhorst@…>

Branches:

master

Children:

56d186f

Parents:

7884e98

Message:

Get rid of CLFS_HOST

Location:

BOOK/cross-tools

Files:

• arm/variables.xml (modified) (2 diffs)
• common/binutils.xml (modified) (3 diffs)
• common/gcc-final.xml (modified) (1 diff)
• common/gcc-static.xml (modified) (1 diff)
• mips/variables.xml (modified) (2 diffs)
• x86/variables.xml (modified) (2 diffs)

BOOK/cross-tools/arm/variables.xml

@@ -19 +19 @@
   <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="../x86/variables.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -33 +25 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
   <table os="g">

BOOK/cross-tools/common/binutils.xml

@@ -51 +51 @@
 
 <screen os="e"><userinput>../binutils-&binutils-version;/configure --prefix=${CLFS}/cross-tools \
-   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-sysroot=${CLFS} \
-   --disable-nls --enable-shared --disable-multilib</userinput></screen>
+   --target=${CLFS_TARGET} --with-sysroot=${CLFS} --disable-nls \
+   --enable-shared --disable-multilib</userinput></screen>
 
     <variablelist os="f">
@@ -66 +66 @@
       </varlistentry>
 
-      <varlistentry os="f2">
-        <term><parameter>--host=${CLFS_HOST}</parameter></term>
-        <listitem>
-          <para>When used with --target, this creates a cross-architecture
-          executable that creates files for ${CLFS_TARGET} but runs on
-          ${CLFS_HOST}.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry os="f3">
         <term><parameter>--target=${CLFS_TARGET}</parameter></term>
@@ -80 +71 @@
           <para>When used with --host, this creates a cross-architecture
           executable that creates files for ${CLFS_TARGET} but runs on
-          ${CLFS_HOST}.</para>
+          the host system.</para>
         </listitem>
       </varlistentry>

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

@@ -60 +60 @@
 
 <screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
+    --target=${CLFS_TARGET} --disable-multilib \
     --with-sysroot=${CLFS} --disable-nls --enable-shared \
     --enable-languages=c --enable-__cxa_atexit \

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

@@ -53 +53 @@
 
 <screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
+    --target=${CLFS_TARGET} --disable-multilib \
     --with-sysroot=${CLFS} --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>

BOOK/cross-tools/mips/variables.xml

@@ -19 +19 @@
   <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="../x86/variables.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
@@ -40 +32 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc
+<screen os="f"><userinput>echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc
 echo export CLFS_MIPS_LEVEL=\""${CLFS_MIPS_LEVEL}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 

BOOK/cross-tools/x86/variables.xml

@@ -15 +15 @@
   <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 CLFS_HOST="$(echo $MACHTYPE | \
-    sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"</userinput></screen>
-
-  <para os="c">Now you will need to set the target triplet for the target
+  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
@@ -31 +23 @@
 <screen os="d"><userinput>export CLFS_TARGET="{target triplet}"</userinput></screen>
 
-  <para os="e">Now we will add these to <filename>~/.bashrc</filename>, just in
+  <para os="e">Now we will add this to <filename>~/.bashrc</filename>, just in
   case you have to exit and restart building later:</para>
 
-<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
   <table os="g">