Re: [PATCH] Fix toplevel configure --enable-multilib handling (PR bootstrap/43328)

Re: [PATCH] Fix toplevel configure --enable-multilib handling (PR bootstrap/43328)

[Ralf Wildenhues]

* DJ Delorie wrote on Tue, Mar 30, 2010 at 09:30:09PM CEST:
> 
> > Ping <http://gcc.gnu.org/ml/gcc-patches/2010-03/msg00509.html>
> 
> Ok.

Thanks for your review.

FYI binutils and gdb-patches, I'm syncing this from GCC.

Cheers,
Ralf

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.

Index: configure.ac
===================================================================
RCS file: /cvs/src/src/configure.ac,v
retrieving revision 1.98
diff -u -r1.98 configure.ac
--- configure.ac	23 Mar 2010 16:05:34 -0000	1.98
+++ configure.ac	31 Mar 2010 05:42:40 -0000
@@ -2882,6 +2882,9 @@
       skip_next=$separate_arg
       continue
       ;;
+    --enable-multilib | --disable-multilib)
+      continue
+      ;;
     -*)
       # An option.  Add it.
       case $ac_arg in
@@ -2950,10 +2953,12 @@
   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.

Re: [PATCH] Fix toplevel configure --enable-multilib handling (PR bootstrap/43328)

[Ralf Wildenhues]

FYI, I'm syncing this patch from GCC to src.

Thanks,
Ralf

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.

Index: configure.ac
===================================================================
RCS file: /cvs/src/src/configure.ac,v
retrieving revision 1.99
diff -u -r1.99 configure.ac
--- configure.ac	31 Mar 2010 05:44:01 -0000	1.99
+++ configure.ac	8 Apr 2010 19:42:18 -0000
@@ -2882,9 +2882,6 @@
       skip_next=$separate_arg
       continue
       ;;
-    --enable-multilib | --disable-multilib)
-      continue
-      ;;
     -*)
       # An option.  Add it.
       case $ac_arg in
@@ -2953,12 +2950,10 @@
   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.