Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/mips64-64/gcc.xml

    r88ef769 r03e6a40  
    7777    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
    7878    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
    79     --enable-cloog-backend=isl --with-gmp=/tools --with-mpfr=/tools \
    80     --with-mpc=/tools --with-isl=/tools --disable-isl-version-check \
     79    --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
    8180    --with-cloog=/tools --with-system-zlib --enable-checking=release \
    8281    --enable-libstdcxx-time --with-native-system-header-dir=/tools/include</userinput></screen>
Note: See TracChangeset for help on using the changeset viewer.