core/gcc: force build architecture to $CARCH - else, setarch may fool us

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//
       '
   )"