gcc: only enable support for C, C++ and LTO for bootstrap/cross.

This finally closes #1529
This commit is contained in:
Juan RP 2015-06-01 07:52:12 +02:00
parent 6bf4be3b6b
commit 2dce2b71c1

View file

@ -24,13 +24,11 @@ replaces="libmudflap>=0 libmudflap-devel>=0 chroot-gcc>=0"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel" subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
subpackages+=" libitm libitm-devel libssp libssp-devel gcc-c++" subpackages+=" libitm libitm-devel libssp libssp-devel gcc-c++"
if [ -z "$CROSS_BUILD" ]; then if [ -n "$CHROOT_READY" -a -z "$CROSS_BUILD" ]; then
subpackages+=" gcc-fortran gcc-objc gcc-objc++" subpackages+=" gcc-fortran gcc-objc gcc-objc++"
subpackages+=" libgfortran-devel libgfortran" subpackages+=" libgfortran-devel libgfortran"
subpackages+=" libobjc-devel libobjc" subpackages+=" libobjc-devel libobjc"
fi
if [ -n "$CHROOT_READY" -a -z "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) *-musl)
# XXX disable go and java with musl # XXX disable go and java with musl
@ -99,31 +97,35 @@ do_configure() {
;; ;;
esac esac
if [ -z "$CHROOT_READY" -o -n "$CROSS_BUILD" ]; then
_langs="c,c++,lto"
fi
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
export CC_FOR_TARGET="$CC" export CC_FOR_TARGET="$CC"
export GCC_FOR_TARGET="$CC" export GCC_FOR_TARGET="$CC"
export CXX_FOR_TARGET="$CXX" export CXX_FOR_TARGET="$CXX"
_langs="c,c++,lto"
_args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=${XBPS_CROSS_BASE}" _args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=${XBPS_CROSS_BASE}"
_args+=" --enable-sjlj-exceptions=no" _args+=" --enable-sjlj-exceptions=no"
else else
case "$XBPS_TARGET_MACHINE" in if [ -z "$CHROOT_READY" ]; then
# XXX disable go and java with musl export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
*-musl) _langs="c,c++,objc,obj-c++,fortran,lto";; _args+=" --with-gmp=${XBPS_MASTERDIR}/usr"
*) _langs="c,c++,objc,obj-c++,fortran,lto,go,java";; _args+=" --with-mpfr=${XBPS_MASTERDIR}/usr"
esac _args+=" --with-isl=${XBPS_MASTERDIR}/usr"
_args+=" --build=${_triplet} --enable-java-gc=boehm --enable-fast-character" _args+=" --with-mpc=${XBPS_MASTERDIR}/usr"
_args+=" --with-cloog=${XBPS_MASTERDIR}/usr"
else
case "$XBPS_TARGET_MACHINE" in
# XXX disable go and java with musl
*-musl) _langs="c,c++,objc,obj-c++,fortran,lto";;
*) _langs="c,c++,objc,obj-c++,fortran,lto,go,java";;
esac
_args+=" --build=${_triplet} --enable-java-gc=boehm --enable-fast-character"
fi
fi fi
if [ -z "$CHROOT_READY" ]; then
export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
_args+=" --with-gmp=${XBPS_MASTERDIR}/usr"
_args+=" --with-mpfr=${XBPS_MASTERDIR}/usr"
_args+=" --with-isl=${XBPS_MASTERDIR}/usr"
_args+=" --with-mpc=${XBPS_MASTERDIR}/usr"
_args+=" --with-cloog=${XBPS_MASTERDIR}/usr"
fi
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
aarch64*|*-musl) _args+=" --disable-libsanitizer";; aarch64*|*-musl) _args+=" --disable-libsanitizer";;
esac esac