summaryrefslogtreecommitdiffstats
path: root/testsuites/aclocal/prog-cxx.m4
diff options
context:
space:
mode:
Diffstat (limited to 'testsuites/aclocal/prog-cxx.m4')
-rw-r--r--testsuites/aclocal/prog-cxx.m411
1 files changed, 4 insertions, 7 deletions
diff --git a/testsuites/aclocal/prog-cxx.m4 b/testsuites/aclocal/prog-cxx.m4
index 8991489814..813b862a8c 100644
--- a/testsuites/aclocal/prog-cxx.m4
+++ b/testsuites/aclocal/prog-cxx.m4
@@ -8,12 +8,13 @@ AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
[
AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
AC_REQUIRE([RTEMS_ENABLE_CXX])
+
+# If CXXFLAGS is not set, default to CFLAGS
+CXXFLAGS=${CXXFLAGS-${CFLAGS}}
+
RTEMS_CHECK_TOOL(CXX,g++)
if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
then
-_RTEMS_FLAGS([CXXFLAGS],
- ["\$(CPU_CFLAGS) \$(RTEMS_CFLAGS_\$(VARIANT_V)_V) \$(CFLAGS_\$(VARIANT_V)_V) -g"])
-
dnl Only accept g++
dnl NOTE: This might be too restrictive
test -z "$CXX" \
@@ -27,9 +28,5 @@ AC_PROG_CXX
[must both either be cross compilers or native compilers]
[Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
fi
-
-else
-## Work-around to a bug in automake
-AM_CONDITIONAL([am__fastdepCXX],[false])
fi
])