summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-07 09:09:09 +0100
committerErich Eckner <git@eckner.net>2018-11-07 09:09:09 +0100
commitb6eda2c4a958d1a3c01cff8b3cd4081d9ee1c3d0 (patch)
tree1565f3a35f331595d300a6c09b9a7b46f44371b1
parent2b69ff29c1e9e1dfa61432108efbc477d4e4aceb (diff)
downloadpackages-b6eda2c4a958d1a3c01cff8b3cd4081d9ee1c3d0.tar.xz
core/gcc: force build architecture to $CARCH - else, setarch may fool us
-rw-r--r--core/gcc/PKGBUILD7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index f069b2a4..cf97f188 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -13,8 +13,9 @@ eval "$(
'
declare -f build | \
sed '
- s/--enable-multilib/--disable-multilib/
- s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
+ /configure/ s/--enable-multilib/--disable-multilib/
+ /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
+ /configure/ s/;$/ --build=$CARCH;/
'
declare -f package_gcc-libs | \
sed '
@@ -83,7 +84,7 @@ if [ "${CARCH}" = "i486" ]; then
eval "$(
declare -f build | \
sed '
- /enable-languages/ s/ada//
+ /enable-languages/ s/,ada//
'
)"