This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: Add --disable-libstdcxx configure option
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: binutils at sourceware dot org
- Date: Sat, 3 Nov 2012 17:10:56 -0700
- Subject: PATCH: Add --disable-libstdcxx configure option
Hi,
I checked in this patch to add --disable-libstdcxx configure option from
GCC.
H.J.
---
Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/ChangeLog,v
retrieving revision 1.1041
diff -u -p -r1.1041 ChangeLog
--- ChangeLog 24 Oct 2012 13:41:35 -0000 1.1041
+++ ChangeLog 4 Nov 2012 00:07:55 -0000
@@ -1,3 +1,12 @@
+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
+ and handle defaulted state only for VxWorks, ARM-wince-pe and AVR.
+
2012-10-24 Corinna Vinschen <corinna@vinschen.de>
* configure.ac (FLAGS_FOR_TARGET,target=cygwin): Fix for building
Index: configure.ac
===================================================================
RCS file: /cvs/src/src/configure.ac,v
retrieving revision 1.177
diff -u -p -r1.177 configure.ac
--- configure.ac 24 Oct 2012 13:41:36 -0000 1.177
+++ configure.ac 4 Nov 2012 00:07:59 -0000
@@ -427,6 +427,15 @@ AC_ARG_ENABLE(libssp,
ENABLE_LIBSSP=$enableval,
ENABLE_LIBSSP=yes)
+AC_ARG_ENABLE(libstdcxx,
+AS_HELP_STRING([--disable-libstdcxx],
+ [do not build libstdc++-v3 directory]),
+ENABLE_LIBSTDCXX=$enableval,
+ENABLE_LIBSTDCXX=default)
+[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
@@ -562,19 +571,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
Index: configure
===================================================================
RCS file: /cvs/src/src/configure,v
retrieving revision 1.433
diff -u -p -r1.433 configure
--- configure 24 Oct 2012 13:41:35 -0000 1.433
+++ configure 4 Nov 2012 00:08:10 -0000
@@ -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