summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-03-31 05:44:01 +0000
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-03-31 05:44:01 +0000
commitaed3b6cda25c77c2b790298935b562ec9d8efabb (patch)
tree7bfded695578d428e19003828b3964f62934187c /configure
parentb791ec4a2cf6d0b1bc0dca6e65298ec43f548e6a (diff)
downloadcygnal-aed3b6cda25c77c2b790298935b562ec9d8efabb.tar.gz
cygnal-aed3b6cda25c77c2b790298935b562ec9d8efabb.tar.bz2
cygnal-aed3b6cda25c77c2b790298935b562ec9d8efabb.zip
Fix toplevel configure --enable-multilib handling.
/: PR bootstrap/43328 * configure.ac: Do not pass --enable-multilib nor --disable-multilib in baseargs. Accept explicitly passed --enable_multilib. * configure: Regenerate.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure b/configure
index c2c406e73..d885973ce 100755
--- a/configure
+++ b/configure
@@ -7778,6 +7778,9 @@ do
skip_next=$separate_arg
continue
;;
+ --enable-multilib | --disable-multilib)
+ continue
+ ;;
-*)
# An option. Add it.
case $ac_arg in
@@ -7846,10 +7849,12 @@ if test x${is_cross_compiler} = xyes ; then
target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
fi
-# Default to --enable-multilib.
-if test x${enable_multilib} = x ; then
+# Pass --enable-multilib to target dirs; default to --enable-multilib.
+case $enable_multilib in
+'' | yes)
target_configargs="--enable-multilib ${target_configargs}"
-fi
+ ;;
+esac
# Pass --with-newlib if appropriate. Note that target_configdirs has
# changed from the earlier setting of with_newlib.