summaryrefslogtreecommitdiffstats
path: root/c/src/aclocal
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2014-09-08 10:19:42 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2014-09-08 11:13:53 +0200
commit6821a629c3bff45770b376702a6e31b4dc656df7 (patch)
tree6b74ed1a2f8c4c66461a3727718a441708b0161a /c/src/aclocal
parentclockdrv_shell.h: Fix warning (diff)
downloadrtems-6821a629c3bff45770b376702a6e31b4dc656df7.tar.bz2
Add -std=gnu++11 to CXXFLAGS if SMP is enabled
This is necessary to use the <atomic> header file used for the atomic operations.
Diffstat (limited to 'c/src/aclocal')
-rw-r--r--c/src/aclocal/prog-cxx.m411
1 files changed, 9 insertions, 2 deletions
diff --git a/c/src/aclocal/prog-cxx.m4 b/c/src/aclocal/prog-cxx.m4
index ba596ba05d..957a595da2 100644
--- a/c/src/aclocal/prog-cxx.m4
+++ b/c/src/aclocal/prog-cxx.m4
@@ -6,11 +6,18 @@ AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
[
AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
AC_REQUIRE([RTEMS_ENABLE_CXX])
+AC_REQUIRE([RTEMS_CHECK_SMP])
+
+# If CXXFLAGS is not set, default to CFLAGS
+if test x"$rtems_cv_HAS_SMP" = x"yes" ; then
+ CXXFLAGS=${CXXFLAGS-${CFLAGS} -std=gnu++11}
+else
+ CXXFLAGS=${CXXFLAGS-${CFLAGS}}
+fi
+
RTEMS_CHECK_TOOL(CXX,g++)
if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
then
- CXXFLAGS=${CXXFLAGS-${CFLAGS}}
-
dnl Only accept g++
dnl NOTE: This might be too restrictive
test -z "$CXX" \