summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-04-08 19:44:08 +0000
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-04-08 19:44:08 +0000
commit084fa560a689c7ad6a426848e4b0b2d73f25f6cb (patch)
treea8f4cccdb1d19d4a0aa24880e1c626c7d8970794 /configure
parenta32a3824a1368fca82d31ee6e9e5ad4db466ca88 (diff)
downloadgdb-084fa560a689c7ad6a426848e4b0b2d73f25f6cb.tar.gz
/:
Merge from gcc: PR bootstrap/43615 PR bootstrap/43328 Revert: 2010-03-31 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * 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, 3 insertions, 8 deletions
diff --git a/configure b/configure
index d885973ce6f..c2c406e7334 100755
--- a/configure
+++ b/configure
@@ -7778,9 +7778,6 @@ do
skip_next=$separate_arg
continue
;;
- --enable-multilib | --disable-multilib)
- continue
- ;;
-*)
# An option. Add it.
case $ac_arg in
@@ -7849,12 +7846,10 @@ if test x${is_cross_compiler} = xyes ; then
target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
fi
-# Pass --enable-multilib to target dirs; default to --enable-multilib.
-case $enable_multilib in
-'' | yes)
+# Default to --enable-multilib.
+if test x${enable_multilib} = x ; then
target_configargs="--enable-multilib ${target_configargs}"
- ;;
-esac
+fi
# Pass --with-newlib if appropriate. Note that target_configdirs has
# changed from the earlier setting of with_newlib.