Changeset 03e6a40 for BOOK/cross-tools/mips64-64/gcc-final.xml

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:

• BOOK/cross-tools/mips64-64/gcc-final.xml (modified) (2 diffs)

BOOK/cross-tools/mips64-64/gcc-final.xml

@@ -60 +60 @@
 
 <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  ../gcc-4.8.2/configure --prefix=/cross-tools \
   --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
   --with-sysroot=${CLFS} --with-local-prefix=/tools \
   --with-native-system-header-dir=/tools/include --disable-nls \
-  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-  --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
-  --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
-  --disable-libmudflap --disable-libssp --disable-threads --disable-multilib \
-  --disable-libatomic --disable-libitm --disable-libsanitizer \
-  --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
-  --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
-  --enable-languages=c --enable-checking=release --with-abi=64
-  </userinput></screen>
+  --enable-shared --disable-static --enable-languages=c,c++ \
+  --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \
+  --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
+  --with-gmp=/cross-tools --with-cloog=/cross-tools \
+  --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
+  --enable-libstdcxx-time --with-abi=64</userinput></screen>
 
     <variablelist os="bg">
@@ -104 +101 @@
       xpointer="xpointer(//*[@os='bg5'])"/>
 
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/gcc-final.xml"
+      xpointer="xpointer(//*[@os='bg6'])"/>
+
     </variablelist>