From a9ef41a7031440db3037fca8e96c1a49be0b1ced Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 31 Mar 2010 05:44:01 +0000 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ configure | 11 ++++++++--- configure.ac | 11 ++++++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf2d209..027f923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-03-31 Ralf Wildenhues + + PR bootstrap/43328 + * configure.ac: Do not pass --enable-multilib nor + --disable-multilib in baseargs. Accept explicitly passed + --enable_multilib. + * configure: Regenerate. + 2010-03-23 Joseph Myers * configure.ac (tic6x-*-*): New case. diff --git a/configure b/configure index c2c406e..d885973 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. diff --git a/configure.ac b/configure.ac index 72407f8..55e9998 100644 --- a/configure.ac +++ b/configure.ac @@ -2882,6 +2882,9 @@ do skip_next=$separate_arg continue ;; + --enable-multilib | --disable-multilib) + continue + ;; -*) # An option. Add it. case $ac_arg in @@ -2950,10 +2953,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. -- 2.7.4