diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 27e8a66136..2501af6894 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -35,6 +35,9 @@ depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" only_for_archs="i686 x86_64" +if [ "$CROSS_BUILD" ]; then + msg_error "${pkgname}-${version}: cannot be cross compiled.\n" +fi _apply_patch() { local pname="$(basename $1)" diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/template b/srcpkgs/cross-arm-linux-gnueabihf7/template index c6e1245043..a858345162 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf7/template +++ b/srcpkgs/cross-arm-linux-gnueabihf7/template @@ -35,6 +35,9 @@ depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" only_for_archs="i686 x86_64" +if [ "$CROSS_BUILD" ]; then + msg_error "${pkgname}-${version}: cannot be cross compiled.\n" +fi _apply_patch() { local pname="$(basename $1)" diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index f4d4883907..0df2bc6c6c 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -34,6 +34,10 @@ makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" depends="${pkgname}-libc-${version}_${revision}" +if [ "$CROSS_BUILD" ]; then + msg_error "${pkgname}-${version}: cannot be cross compiled.\n" +fi + _apply_patch() { local pname="$(basename $1)" diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 6915e86f37..f8262711d4 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -31,11 +31,10 @@ hostmakedepends="perl flex" makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" depends="${pkgname}-libc-${version}_${revision}" +only_for_archs="i686 x86_64 x86_64-musl" -if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then - # No need to build a cross compiler if we are running x86_64-musl. - msg_normal "${pkgname}-${version}: cannot be built on $XBPS_TARGET_MACHINE\n" - exit 0 +if [ "$CROSS_BUILD" ]; then + msg_error "${pkgname}-${version}: cannot be cross compiled.\n" fi _apply_patch() { diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index 8d773fc59d..ac30104915 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -34,6 +34,10 @@ makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" +if [ "$CROSS_BUILD" ]; then + msg_error "${pkgname}-${version}: cannot be cross compiled.\n" +fi + _apply_patch() { local pname="$(basename $1)" diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/template b/srcpkgs/cross-mips-softfloat-linux-gnu/template index 09403ab52f..0c76c99603 100644 --- a/srcpkgs/cross-mips-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mips-softfloat-linux-gnu/template @@ -34,6 +34,10 @@ makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" +if [ "$CROSS_BUILD" ]; then + msg_error "${pkgname}-${version}: cannot be cross compiled.\n" +fi + _apply_patch() { local pname="$(basename $1)" diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template index fa3402acee..b4609a775d 100644 --- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template @@ -34,6 +34,10 @@ makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" +if [ "$CROSS_BUILD" ]; then + msg_error "${pkgname}-${version}: cannot be cross compiled.\n" +fi + _apply_patch() { local pname="$(basename $1)" diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 7fbf023329..82f25bfaaf 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -31,12 +31,12 @@ hostmakedepends="perl flex" makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel" nostrip_files="libgcc.a libgcov.a libgcc_eh.a" depends="${pkgname}-libc-${version}_${revision}" +only_for_archs="i686 i686-musl x86_64" -if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then - # No need to build a cross compiler if we are running x86_64-musl. - msg_normal "${pkgname}-${version}: cannot be built on $XBPS_TARGET_MACHINE\n" - exit 0 +if [ "$CROSS_BUILD" ]; then + msg_error "${pkgname}-${version}: cannot be cross compiled.\n" fi + _apply_patch() { local pname="$(basename $1)"