diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-31 05:44:30 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-31 05:44:30 +0000 |
| commit | 7816cdf1866f30374e1eaf957d890219a2255955 (patch) | |
| tree | 885a59d0e2efb0c1f36f02d5353c49af3dea66ae | |
| parent | 4e4c89ecdf082d0ea8a21af9c78b969a989cf62d (diff) | |
| download | gcc-7816cdf1866f30374e1eaf957d890219a2255955.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157851 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 24 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index cbffd395f85..60244b9696f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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-28 Andrew Pinski <pinskia@gmail.com> * MAINTAINERS (spu port): Remove me. diff --git a/configure b/configure index c2c406e7334..d885973ce6f 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 72407f86878..55e99980adc 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. |