diff options
| -rw-r--r-- | gdb/build-with-cxx.m4 | 18 | ||||
| -rwxr-xr-x | gdb/configure | 17 | ||||
| -rwxr-xr-x | gdb/gdbserver/configure | 17 |
3 files changed, 46 insertions, 6 deletions
diff --git a/gdb/build-with-cxx.m4 b/gdb/build-with-cxx.m4 index b6284fda2ff..03ff54d6291 100644 --- a/gdb/build-with-cxx.m4 +++ b/gdb/build-with-cxx.m4 @@ -21,6 +21,21 @@ dnl allowing a user to build with a C++ compiler. AC_DEFUN([GDB_AC_BUILD_WITH_CXX], [ + # The "doesn't support C++ yet" hall of shame. + case $host in + *-*aix* | \ + *-*go32* | \ + *-*darwin* | \ + *-*solaris* | \ + *-*nto* | \ + *-*bsd* | \ + xtensa*-*-linux* | \ + null) + enable_build_with_cxx=no ;; + *) + enable_build_with_cxx=yes ;; + esac + AC_ARG_ENABLE(build-with-cxx, AS_HELP_STRING([--enable-build-with-cxx], [build with C++ compiler instead of C compiler]), [case $enableval in @@ -28,8 +43,7 @@ AC_DEFUN([GDB_AC_BUILD_WITH_CXX], ;; *) AC_MSG_ERROR([bad value $enableval for --enable-build-with-cxx]) ;; - esac], - [enable_build_with_cxx=no]) + esac]) if test "$enable_build_with_cxx" = "yes"; then COMPILER='$(CXX)' diff --git a/gdb/configure b/gdb/configure index 249a39975b0..fce21548fea 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5001,6 +5001,21 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # See if we are building with C++, and substitute COMPILER. + # The "doesn't support C++ yet" hall of shame. + case $host in + *-*aix* | \ + *-*go32* | \ + *-*darwin* | \ + *-*solaris* | \ + *-*nto* | \ + *-*bsd* | \ + xtensa*-*-linux* | \ + null) + enable_build_with_cxx=no ;; + *) + enable_build_with_cxx=yes ;; + esac + # Check whether --enable-build-with-cxx was given. if test "${enable_build_with_cxx+set}" = set; then : enableval=$enable_build_with_cxx; case $enableval in @@ -5009,8 +5024,6 @@ if test "${enable_build_with_cxx+set}" = set; then : *) as_fn_error "bad value $enableval for --enable-build-with-cxx" "$LINENO" 5 ;; esac -else - enable_build_with_cxx=no fi diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 87dfda06eed..9b2018c7cad 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4813,6 +4813,21 @@ fi # See if we are building with C++, and substitute COMPILER. + # The "doesn't support C++ yet" hall of shame. + case $host in + *-*aix* | \ + *-*go32* | \ + *-*darwin* | \ + *-*solaris* | \ + *-*nto* | \ + *-*bsd* | \ + xtensa*-*-linux* | \ + null) + enable_build_with_cxx=no ;; + *) + enable_build_with_cxx=yes ;; + esac + # Check whether --enable-build-with-cxx was given. if test "${enable_build_with_cxx+set}" = set; then : enableval=$enable_build_with_cxx; case $enableval in @@ -4821,8 +4836,6 @@ if test "${enable_build_with_cxx+set}" = set; then : *) as_fn_error "bad value $enableval for --enable-build-with-cxx" "$LINENO" 5 ;; esac -else - enable_build_with_cxx=no fi |