aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-04-01 16:32:38 +0000
committerRalf Wildenhues <rwild@gcc.gnu.org>2010-04-01 16:32:38 +0000
commitdc683a3f632650d76a0fa061c7c52d7934b5a6c0 (patch)
treeb5b9f34da51535c0be523cce206b1d3c8886fb08
parente76a3fde81380ce422994e1a0fb21322d2268341 (diff)
downloadgcc-dc683a3f632650d76a0fa061c7c52d7934b5a6c0.zip
gcc-dc683a3f632650d76a0fa061c7c52d7934b5a6c0.tar.gz
gcc-dc683a3f632650d76a0fa061c7c52d7934b5a6c0.tar.bz2
re PR bootstrap/43615 (bootstrap fails: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory)
/: 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. From-SVN: r157916
-rw-r--r--ChangeLog14
-rwxr-xr-xconfigure11
-rw-r--r--configure.ac11
3 files changed, 20 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e8fb30..bfe6a22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-04-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ 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 Ulrich Weigand <uweigand@de.ibm.com>
* MAINTAINERS (CPU Port Maintainers): Add myself for spu port.
diff --git a/configure b/configure
index d885973..c2c406e 100755
--- a/configure
+++ b/configure
@@ -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.