summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-11-13 10:39:33 +0100
committerChris Johns <chrisj@rtems.org>2015-11-13 20:48:07 +1100
commitb2ce230eb85d23d017f3e86fa9223e781e803f22 (patch)
tree2f454f7f93d29dee8a99edf616ba7d4da3a71495
parentFix the rtems-tld wrapper option. (diff)
downloadrtems_waf-b2ce230eb85d23d017f3e86fa9223e781e803f22.tar.bz2
Do RTEMS CPU options check early
Set mandatory C++ standard option in case SMP is enabled. Close #2418.
-rw-r--r--rtems.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/rtems.py b/rtems.py
index 982ba24..be926dd 100644
--- a/rtems.py
+++ b/rtems.py
@@ -191,11 +191,15 @@ def configure(conf, bsp_configure = None):
#
# Checks for various RTEMS features.
#
- conf.multicheck({ 'header_name': 'rtems.h'},
- { 'header_name': 'rtems/score/cpuopts.h'},
- msg = 'Checking for RTEMS headers',
+ conf.multicheck({ 'header_name': 'rtems/score/cpuopts.h'},
+ msg = 'Checking for RTEMS CPU options header',
mandatory = True)
load_cpuopts(conf, ab, conf.options.rtems_path)
+ if conf.env['RTEMS_SMP'] == 'Yes':
+ conf.env.CXXFLAGS += ['-std=gnu++11']
+ conf.multicheck({ 'header_name': 'rtems.h'},
+ msg = 'Checking for RTEMS header',
+ mandatory = True)
#
# Add tweaks.