From 33406faf465d140569904a7d5325254517683a95 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 8 Apr 2010 19:44:08 +0000 Subject: /: Merge from gcc: PR bootstrap/43615 PR bootstrap/43328 Revert: 2010-03-31 Ralf Wildenhues * configure.ac: Do not pass --enable-multilib nor --disable-multilib in baseargs. Accept explicitly passed --enable_multilib. * configure: Regenerate. --- configure | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d885973ce6..c2c406e733 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. -- cgit v1.2.1