Patchwork VxWorks is done

login
register
mail settings
Submitter H.J. Lu
Date Nov. 3, 2012, 11:49 p.m.
Message ID <CAMe9rOrpGf1ox5FgGO+AKAo5R_9QiECJMuhi9zVRamCJHymOnQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/196961/
State New
Headers show

Comments

H.J. Lu - Nov. 3, 2012, 11:49 p.m.
On Sat, Nov 3, 2012 at 8:54 AM, Bruce Korb <bruce.korb@gmail.com> wrote:
>

I checked in this patch to regenerate configure.

Patch

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 193127)
+++ ChangeLog	(working copy)
@@ -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
Index: configure
===================================================================
--- configure	(revision 193127)
+++ configure	(working copy)
@@ -749,6 +749,7 @@ 
 enable_libquadmath_support
 enable_libada
 enable_libssp
+enable_libstdcxx
 enable_static_libjava
 enable_bootstrap
 with_mpc
@@ -1464,6 +1465,7 @@ 
                           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 @@ 
 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 @@ 
 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