diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 87a044bd9fa..6d6c9adec5e 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -41,15 +41,15 @@ do_configure() { echo "sbindir=/usr/sbin" >> configparms echo "rootsbindir=/usr/sbin" >> configparms - if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then + case "$XBPS_TARGET_MACHINE" in # Build with -mno-tls-direct-seg-refs to avoid performance # problems with Xen on x86 32bit. - export CFLAGS+=" -mno-tls-direct-seg-refs" - elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then + i686) export CFLAGS+=" -mno-tls-direct-seg-refs";; # Force hard float ABI. # To build for soft float: --with-float=soft --without-fp. - configure_args+=" --with-float=hard" - fi + arm*) configure_args+=" --with-float=hard";; + esac + if [ "$CROSS_BUILD" ]; then configure_args+=" --with-headers=${XBPS_CROSS_BASE}/usr/include" else @@ -116,7 +116,7 @@ glibc-devel_package() { pkg_install() { vmove usr/include vmove "usr/lib/*.a" - vmove "usr/lib/*crt1.o" + vmove "usr/lib/*.o" vmove usr/share/info } }