JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix toplevel configure --enable-multilib handling.

Browse Source 
/:
	PR bootstrap/43328
	* configure.ac: Do not pass --enable-multilib nor
	--disable-multilib in baseargs.  Accept explicitly passed
	--enable_multilib.
	* configure: Regenerate.
This commit is contained in:
Ralf Wildenhues 2010-03-31 05:44:01 +00:00
parent b791ec4a2c
commit aed3b6cda2
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2010-03-23 Joseph Myers <joseph@codesourcery.com>
* configure.ac (tic6x-*-*): New case. * configure.ac (tic6x-*-*): New case.

11
configure vendored
View File

@ -7778,6 +7778,9 @@ do
skip_next=$separate_arg skip_next=$separate_arg
continue continue
;; ;;
--enable-multilib | --disable-multilib)
continue
;;
-*) -*)
# An option. Add it. # An option. Add it.
case $ac_arg in 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}" target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
fi fi
# Default to --enable-multilib. # Pass --enable-multilib to target dirs; default to --enable-multilib.
if test x${enable_multilib} = x ; then case $enable_multilib in
'' | yes)
target_configargs="--enable-multilib ${target_configargs}" target_configargs="--enable-multilib ${target_configargs}"
fi ;;
esac
# Pass --with-newlib if appropriate. Note that target_configdirs has # Pass --with-newlib if appropriate. Note that target_configdirs has
# changed from the earlier setting of with_newlib. # changed from the earlier setting of with_newlib.

11
configure.ac
View File

@ -2882,6 +2882,9 @@ do
skip_next=$separate_arg skip_next=$separate_arg
continue continue
;; ;;
--enable-multilib | --disable-multilib)
continue
;;
-*) -*)
# An option. Add it. # An option. Add it.
case $ac_arg in 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}" target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
fi fi
# Default to --enable-multilib. # Pass --enable-multilib to target dirs; default to --enable-multilib.
if test x${enable_multilib} = x ; then case $enable_multilib in
'' | yes)
target_configargs="--enable-multilib ${target_configargs}" target_configargs="--enable-multilib ${target_configargs}"
fi ;;
esac
# Pass --with-newlib if appropriate. Note that target_configdirs has # Pass --with-newlib if appropriate. Note that target_configdirs has
# changed from the earlier setting of with_newlib. # changed from the earlier setting of with_newlib.