From b2ce230eb85d23d017f3e86fa9223e781e803f22 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 13 Nov 2015 10:39:33 +0100 Subject: Do RTEMS CPU options check early Set mandatory C++ standard option in case SMP is enabled. Close #2418. --- rtems.py | 10 +++++++--- 1 file 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. -- cgit v1.2.3