Changeset 7afc252 in clfs-embedded for BOOK/cross-tools/common


Ignore:
Timestamp:
Feb 12, 2011, 3:08:06 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
master
Children:
f45393b
Parents:
7003296 (diff), bd0ad10 (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:

Merge remote branch 'remotes/abradford/master'

Location:
BOOK/cross-tools/common
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r7003296 r7afc252  
    55  %general-entities;
    66]>
     7
     8<!-- Common GCC-Final -->
    79
    810<sect1 id="ch-cross-tools-gcc-final" role="wrap">
    … …  
    1618  </indexterm>
    1719
    18   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     20  <xi:include role="package" xmlns:xi="http://www.w3.org/2003/XInclude"
    1921  href="gcc-static.xml"
    2022  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2325    <title>Installation of GCC Cross Compiler</title>
    2426
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     27    <xi:include os="c" xmlns:xi="http://www.w3.org/2003/XInclude"
    2628    href="gcc-static.xml"
    2729    xpointer="xpointer(//*[@os='c'])"/>
    2830
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    <xi:include os="d" xmlns:xi="http://www.w3.org/2003/XInclude"
    3032    href="gcc-static.xml"
    3133    xpointer="xpointer(//*[@os='d'])"/>
    3234
    33     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     35    <xi:include os="e" xmlns:xi="http://www.w3.org/2003/XInclude"
    3436    href="gcc-static.xml"
    3537    xpointer="xpointer(//*[@os='e'])"/>
    3638
     39<!-- This is the common configure line for GCC-Final -->
     40<!-- It's not actually used by any arch but is here for reference. -->
    3741<screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \
    3842  ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
    … …  
    4145  --enable-languages=c --enable-c99 --enable-long-long \
    4246  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
    43   --with-mpc=${CLFS}/cross-tools --with-abi=${CLFS_ABI}</userinput></screen>
     47  --with-mpc=${CLFS}/cross-tools</userinput></screen>
    4448
    4549    <variablelist os="af">
    … …  
    6973    </variablelist>
    7074
    71     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     75    <xi:include os="ah" xmlns:xi="http://www.w3.org/2003/XInclude"
    7276    href="gcc-static.xml"
    73     xpointer="xpointer(//*[@os='ag'])"/>
     77    xpointer="xpointer(//*[@os='ah'])"/>
    7478
    75 <screen os="ah"><userinput>make</userinput></screen>
     79<screen os="ai"><userinput>make</userinput></screen>
    7680
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     81    <xi:include os="aj" xmlns:xi="http://www.w3.org/2003/XInclude"
    7882    href="gcc-static.xml"
    79     xpointer="xpointer(//*[@os='ai'])"/>
     83    xpointer="xpointer(//*[@os='aj'])"/>
    8084
    81 <screen os="aj"><userinput>make install</userinput></screen>
     85<screen os="ak"><userinput>make install</userinput></screen>
    8286
    8387  </sect2>

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

    r7003296 r7afc252  
    66]>
    77
     8<!-- Common GCC-Static -->
     9
    810<sect1 id="ch-cross-tools-gcc-static" role="wrap">
    911  <?dbhtml filename="gcc-static.html"?>
    … …  
    2527
    2628  <sect2 role="installation">
    27     <title>Installation of Cross GCC Compiler with Static libgcc
     29    <title os="a">Installation of Cross GCC Compiler with Static libgcc
    2830    and no Threads</title>
    2931
    … …  
    3638    <para os="e">Prepare GCC for compilation:</para>
    3739
     40<!-- This is the common configure line for GCC-Static. -->
     41<!-- It's not actually used by any arch but is here for reference. -->
    3842<screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \
    3943  ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
    … …  
    4347  --with-mpc=${CLFS}/cross-tools --without-headers --with-newlib \
    4448  --disable-decimal-float --disable-libgomp --disable-libmudflap \
    45   --disable-libssp --disable-threads --enable-languages=c \
    46   --with-abi=${CLFS_ABI}</userinput></screen>
     49  --disable-libssp --disable-threads --enable-languages=c</userinput></screen>
    4750
    4851    <variablelist os="af">
    … …  
    207210      </varlistentry>
    208211
    209       <varlistentry os="af19">
    210         <term><parameter>--with-abi=${CLFS_ABI}</parameter></term>
    211         <listitem>
    212           <para>This option sets the ABI selected earlier.</para>
    213         </listitem>
    214       </varlistentry>
    215 
    216212    </variablelist>
    217213
    218     <para os="ag">Continue with compiling the package:</para>
    219 
    220 <screen os="ah"><userinput>make all-gcc all-target-libgcc</userinput></screen>
    221 
    222     <para os="ai">Install the package:</para>
    223 
    224 <screen os="aj"><userinput>make install-gcc install-target-libgcc</userinput></screen>
     214    <para os="ah">Continue with compiling the package:</para>
     215
     216<screen os="ai"><userinput>make all-gcc all-target-libgcc</userinput></screen>
     217
     218    <para os="aj">Install the package:</para>
     219
     220<screen os="ak"><userinput>make install-gcc install-target-libgcc</userinput></screen>
    225221
    226222  </sect2>
Note: See TracChangeset for help on using the changeset viewer.