diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template index b99ae6ea6c5..f8675ce0c9e 100644 --- a/srcpkgs/chroot-gcc/template +++ b/srcpkgs/chroot-gcc/template @@ -7,7 +7,7 @@ _mpc_ver=0.8.2 pkgname=chroot-gcc version=${_majorver}.3 -revision=1 +revision=2 wrksrc="gcc-${version}" homepage="http://gcc.gnu.org" short_desc="The GNU C Compiler suite -- for xbps-src use" @@ -105,6 +105,10 @@ _mpc_build() { do_configure() { local _floatabi _args + if [ "$CROSS_BUILD" ]; then + _args="--host=$XBPS_CROSS_TRIPLET" + fi + if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then _floatabi="--with-float=hard" elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then @@ -132,7 +136,8 @@ do_configure() { cd gcc-build CONFIG_SHELL=/bin/bash \ - ../gcc-${version}/configure ${CONFIGURE_SHARED_ARGS} \ + ../gcc-${version}/configure --prefix=/usr \ + --mandir=/usr/share/man --infodir=/usr/share/info \ --libdir=/usr/lib --libexecdir=/usr/lib \ --enable-clocale=gnu --enable-shared \ --enable-threads=posix --enable-__cxa_atexit \ @@ -145,7 +150,7 @@ do_configure() { --without-cloog --without-ppl --disable-libstdcxx-pch \ --disable-libquadmath --disable-libquadmath-support \ --disable-libgomp --disable-libssp --disable-libitm \ - ${_floatabi} + ${_args} ${_floatabi} } do_build() {