Changeset 026bb5d for BOOK/boot/sparc/silo-build.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated simp branch to match main book

File:

• BOOK/boot/sparc/silo-build.xml (modified) (1 diff)

BOOK/boot/sparc/silo-build.xml

@@ -31 +31 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
+<para os="ae">This sed allows us to compile the bin2h binary separately.</para>
+
+<screen os="ad"><userinput>sed -i -e 's@\$(PROGRAMS)$@programs\n\nprograms: &amp;@' common/Makefile</userinput></screen>
+
+<para os="af">Compile the bin2h and util binaries for the host.</para>
+
+<screen os="aa"><userinput>make -C common programs CC=cc
+make -C second util CC=cc</userinput></screen>
+
+    <variablelist>
+      <varlistentry>
+        <term><parameter>CC=cc</parameter></term>
+        <listitem>
+          <para>Overwrites the default value of <command>gcc -m32</command> which will fail 
+to compile on 64 bit targets. This is not to be confused with <command>CC=${CC}</command> below.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/sparc/silo.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>make CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
+<screen os="ac"><userinput>make CC=${CC} AS=${AS} LD=${LD} STRIP=${STRIP}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"