From 1873ec0c11a9f5eaaa06cd13449115af4f8b7b17 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Sat, 3 Nov 2012 23:45:55 +0000
Subject: [PATCH] Regenerate top-level configure
* configure: Regenerated.
From-SVN: r193128
---
ChangeLog | 4 ++++
configure | 42 +++++++++++++++++++++++++++++-------------
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 961340b99979..157f17d9536a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-03 H.J. Lu <hongjiu.lu@intel.com>
+
+ * configure: Regenerated.
+
2012-11-03 Robert Mason <rbmj@verizon.net>
* configure.ac: add --disable-libstdcxx configure option
diff --git a/configure b/configure
index 4d9fc2a4e0e3..baf09495998b 100755
--- a/configure
+++ b/configure
@@ -749,6 +749,7 @@ enable_libquadmath
enable_libquadmath_support
enable_libada
enable_libssp
+enable_libstdcxx
enable_static_libjava
enable_bootstrap
with_mpc
@@ -1464,6 +1465,7 @@ Optional Features:
disable libquadmath support for Fortran
--enable-libada build libada directory
--enable-libssp build libssp directory
+ --disable-libstdcxx do not build libstdc++-v3 directory
--enable-static-libjava[=ARG]
build static libjava [default=no]
--enable-bootstrap enable bootstrapping [yes if native build]
@@ -3073,6 +3075,17 @@ else
fi
+# Check whether --enable-libstdcxx was given.
+if test "${enable_libstdcxx+set}" = set; then :
+ enableval=$enable_libstdcxx; ENABLE_LIBSTDCXX=$enableval
+else
+ ENABLE_LIBSTDCXX=default
+fi
+
+if test "${ENABLE_LIBSTDCXX}" = "no" ; then
+ noconfigdirs="$noconfigdirs libstdc++-v3"
+fi
+
# Save it here so that, even in case of --enable-libgcj, if the Java
# front-end isn't enabled, we still get libgcj disabled.
libgcj_saved=$libgcj
@@ -3216,19 +3229,22 @@ case "${target}" in
esac
# Disable libstdc++-v3 for some systems.
-case "${target}" in
- *-*-vxworks*)
- # VxWorks uses the Dinkumware C++ library.
- noconfigdirs="$noconfigdirs target-libstdc++-v3"
- ;;
- arm*-wince-pe*)
- # the C++ libraries don't build on top of CE's C libraries
- noconfigdirs="$noconfigdirs target-libstdc++-v3"
- ;;
- avr-*-*)
- noconfigdirs="$noconfigdirs target-libstdc++-v3"
- ;;
-esac
+# Allow user to override this if they pass --enable-libstdc++-v3
+if test "${ENABLE_LIBSTDCXX}" = "default" ; then
+ case "${target}" in
+ *-*-vxworks*)
+ # VxWorks uses the Dinkumware C++ library.
+ noconfigdirs="$noconfigdirs target-libstdc++-v3"
+ ;;
+ arm*-wince-pe*)
+ # the C++ libraries don't build on top of CE's C libraries
+ noconfigdirs="$noconfigdirs target-libstdc++-v3"
+ ;;
+ avr-*-*)
+ noconfigdirs="$noconfigdirs target-libstdc++-v3"
+ ;;
+ esac
+fi
# Disable Fortran for some systems.
case "${target}" in
--
GitLab