diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 18 insertions, 16 deletions
@@ -1,3 +1,15 @@ +2010-04-08 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + 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. + 2010-03-31 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR bootstrap/43328 @@ -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. diff --git a/configure.ac b/configure.ac index 55e9998..72407f8 100644 --- a/configure.ac +++ b/configure.ac @@ -2882,9 +2882,6 @@ do skip_next=$separate_arg continue ;; - --enable-multilib | --disable-multilib) - continue - ;; -*) # An option. Add it. case $ac_arg in @@ -2953,12 +2950,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. |