From a4b8a37d4ba3c6276e40763799fc0faf75be93ec Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 6 Jan 2005 14:56:27 +0000 Subject: 2004-01-06 Ralf Corsepius * aclocal/env-rtemsbsp.m4: Remove CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V. * aclocal/prog-cc.m4: Don't invoke _RTEMS_FLAGS to set up RTEMS_CFLAGS. * aclocal/prog-cxx.m4: Let CXXFLAGS default to CFLAGS. Don't invoke _RTEMS_FLAGS to set up RTEMS_CXXFLAGS. Remove am__fastdepCXX conditional. --- testsuites/aclocal/prog-cxx.m4 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'testsuites/aclocal/prog-cxx.m4') 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 ]) -- cgit v1.2.3