diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 24 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2010-03-31 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + 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 <joseph@codesourcery.com> * configure.ac (tic6x-*-*): New case. @@ -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. |