gcc: only enable support for C, C++ and LTO for bootstrap/cross.
This finally closes #1529
This commit is contained in:
parent
6bf4be3b6b
commit
2dce2b71c1
1 changed files with 20 additions and 18 deletions
|
@ -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,14 +97,25 @@ 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
|
||||||
|
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"
|
||||||
else
|
else
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
# XXX disable go and java with musl
|
# XXX disable go and java with musl
|
||||||
|
@ -115,15 +124,8 @@ do_configure() {
|
||||||
esac
|
esac
|
||||||
_args+=" --build=${_triplet} --enable-java-gc=boehm --enable-fast-character"
|
_args+=" --build=${_triplet} --enable-java-gc=boehm --enable-fast-character"
|
||||||
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
|
fi
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
aarch64*|*-musl) _args+=" --disable-libsanitizer";;
|
aarch64*|*-musl) _args+=" --disable-libsanitizer";;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in a new issue