Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/temp-system/multilib/gcc.xml

    r1c9985f r026bb5d  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../cross-tools/multilib/gcc-static.xml"
     26    href="../../final-system/common/gcc.xml"
    2727    xpointer="xpointer(//*[@os='p1'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../cross-tools/multilib/gcc-static.xml"
     30    href="../../final-system/common/gcc.xml"
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    3232
     
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/gcc.xml"
    51     xpointer="xpointer(//*[@os='cf'])"/>
     50    href="../../final-system/common/gcc.xml"
     51    xpointer="xpointer(//*[@os='fix1'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/gcc.xml"
    55     xpointer="xpointer(//*[@os='cg'])"/>
     54    href="../../final-system/common/gcc.xml"
     55    xpointer="xpointer(//*[@os='fix2'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    7474  ../gcc-&gcc-version;/configure --prefix=/tools \
    7575  --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    76   --target=${CLFS_TARGET} --with-local-prefix=/tools  --enable-long-long \
    77   --enable-c99 --enable-shared --enable-threads=posix \
    78   --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
    79   --disable-libstdcxx-pch</userinput></screen>
     76  --target=${CLFS_TARGET} --libexecdir=/tools/lib64 --with-local-prefix=/tools \
     77  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
     78  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
     79  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
     80  --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
     81  --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
     82  --with-native-system-header-dir=/tools/include --disable-libssp \
     83  --disable-install-libiberty  --enable-libstdcxx-time \
     84  --enable-checking=release</userinput></screen>
    8085
    8186    <variablelist os="dd">
     
    97102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    98103    href="../common/gcc.xml"
    99     xpointer="xpointer(//*[@os='ts1'])"/>
     104    xpointer="xpointer(//*[@os='s1'])"/>
    100105
    101106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    102107    href="../common/gcc.xml"
    103     xpointer="xpointer(//*[@os='ts2'])"/>
     108    xpointer="xpointer(//*[@os='s2'])"/>
    104109
    105110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.