app-tools cc: fail for -print-multiarch

Some packages (e.g. python) will do the wrong thing if the
compiler pretends to support multiarch.

with thanks to @rday

diff --git a/app-tools/cc.in b/app-tools/cc.in
index 32fef5f04d306e3081a680261e9dffad6df3a074..2d78bdf8c49cd0877d440559e8afab01230c111c 100644 (file)
--- a/app-tools/cc.in
+++ b/app-tools/cc.in
@@ -67,6 +67,11 @@ for arg in "$@"; do
        [ "${arg}" = "-E" ] && MODE=compile
        [ "${arg}" = "-o" ] && WANTARG=yes && continue
        [ -n "${WANTARG}" ] && OUTFILE=${arg} && WANTARG=
+
+       # even if the backing compiler supports multiarch, we do not
+       [ "${arg}" = "-print-multiarch" ] && \
+           { echo "${PROGNAME}: unrecognized option '-print-multiarch'" 2>&1;
+             exit 1; }
 done
 
 case ${MODE} in

diff --git a/buildrump.sh b/buildrump.sh
index 760c6a948ef358adb7ec5a03843f9ee9d310fd2a..d20ff4ba5eaad423d22c991458f245ccd3c23b07 160000 (submodule)
--- a/buildrump.sh
+++ b/buildrump.sh
@@ -1 +1 @@
-Subproject commit 760c6a948ef358adb7ec5a03843f9ee9d310fd2a
+Subproject commit d20ff4ba5eaad423d22c991458f245ccd3c23b07