summaryrefslogtreecommitdiffstats
path: root/testsuites/aclocal/prog-cxx.m4
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2016-08-10 13:07:29 +1000
committerChris Johns <chrisj@rtems.org>2016-08-11 17:20:10 +1000
commit9a4eca584321408ecac7b67a562d9c37be719d6a (patch)
treec8f0b5e9e4a1840ddf87d4ad6313613c1f4cf128 /testsuites/aclocal/prog-cxx.m4
parentposix: nanosleep: adjust elapsed time calculation (diff)
downloadrtems-9a4eca584321408ecac7b67a562d9c37be719d6a.tar.bz2
build-system: Always enable C++ if the compiler is present.
We always build a C++ compiler and building with C++ does not effect RTEMS or the runtime. This patch always enabled the support. There is no need to manually enable it any more. You can disable C++ with '--disable-cxx'. If an architecture does not have a C++ compiler support is automatically disabled.
Diffstat (limited to 'testsuites/aclocal/prog-cxx.m4')
-rw-r--r--testsuites/aclocal/prog-cxx.m439
1 files changed, 22 insertions, 17 deletions
diff --git a/testsuites/aclocal/prog-cxx.m4 b/testsuites/aclocal/prog-cxx.m4
index c71bac961e..91f2b7fbef 100644
--- a/testsuites/aclocal/prog-cxx.m4
+++ b/testsuites/aclocal/prog-cxx.m4
@@ -1,6 +1,6 @@
-dnl
+dnl
dnl Check for target g++
-dnl
+dnl
AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
[
@@ -9,7 +9,7 @@ AC_REQUIRE([RTEMS_ENABLE_CXX])
RTEMS_CHECK_CPUOPTS([RTEMS_SMP])
# If CXXFLAGS is not set, default to CFLAGS
-if test x"$rtems_cv_RTEMS_SMP" = x"yes" ; then
+if test x"$rtems_cv_HAS_SMP" = x"yes" ; then
CXXFLAGS=${CXXFLAGS-${CFLAGS} -std=gnu++11}
else
CXXFLAGS=${CXXFLAGS-${CFLAGS}}
@@ -18,21 +18,26 @@ fi
RTEMS_CHECK_TOOL(CXX,g++)
if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
then
-dnl Only accept g++
-dnl NOTE: This might be too restrictive
-test -z "$CXX" \
- && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
-AC_PROG_CXX
-AC_PROG_CXXCPP
-
- if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then
- AC_MSG_ERROR([***]
- [Inconsistency in compiler configuration:]
- [Target C compiler and target C++ compiler]
- [must both either be cross compilers or native compilers])
+ dnl Only accept g++
+ dnl NOTE: This might be too restrictive
+ if test -z "$CXX";
+ then
+ RTEMS_HAS_CPLUSPLUS=no
+ HAS_CPLUSPLUS=no
+ ## Work-around to a bug in automake
+ AM_CONDITIONAL([am__fastdepCXX],[false])
+ else
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
+ if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then
+ AC_MSG_ERROR([***]
+ [Inconsistency in compiler configuration:]
+ [Target C compiler and target C++ compiler]
+ [must both either be cross compilers or native compilers])
+ fi
fi
else
-## Work-around to a bug in automake
-AM_CONDITIONAL([am__fastdepCXX],[false])
+ ## Work-around to a bug in automake
+ AM_CONDITIONAL([am__fastdepCXX],[false])
fi
])