Distinguish between C and C++ flags

Author: theotherjimmy

tools/build.py

@@ -230,7 +230,7 @@
     else:
         # Build
         extra_flags = {'cflags': options.cflags, 'asmflags': options.asmflags,
-                       'ldflags': options.ldflags}
+                       'ldflags': options.ldflags, 'cxxflags': options.cxxflags}
         for toolchain in toolchains:
             for target in targets:
                 tt_id = "%s::%s" % (toolchain, target)

tools/build_api.py

@@ -318,9 +318,10 @@ def prepare_toolchain(src_paths, target, toolchain_name,
     except KeyError:
         raise KeyError("Toolchain %s not supported" % toolchain_name)
 
-    if extra_flags and 'cflags' in extra_flags:
-        toolchain.hook.hook_cmdline_compiler(
-            lambda name, flags: flags + extra_flags['cflags'])
+    if extra_flags  and 'cflags' in extra_flags:
+        toolchain.cc.extend(extra_flags['cflags'])
+    if extra_flags  and 'cxxflags' in extra_flags:
+        toolchain.cppc.extend(extra_flags['cxxflags'])
     if extra_flags and 'ldflags' in extra_flags:
         toolchain.hook.hook_cmdline_linker(
             lambda name, flags: flags + extra_flags['ldflags'])
@@ -550,7 +551,7 @@ def build_library(src_paths, build_path, target, toolchain_name,
     toolchain = prepare_toolchain(
         src_paths, target, toolchain_name, macros=macros, options=options,
         clean=clean, jobs=jobs, notify=notify, silent=silent, verbose=verbose,
-        extra_verbose=extra_verbose, extra_flags=None)
+        extra_verbose=extra_verbose, extra_flags=extra_flags)
 
     # The first path will give the name to the library
     if name is None:

tools/make.py

@@ -261,7 +261,7 @@
 
         try:
             extra_flags = {'cflags': options.cflags, 'asmflags': options.asmflags,
-                           'ldflags': options.ldflags}
+                           'ldflags': options.ldflags, 'cxxflags': options.cxxflags}
             bin_file = build_project(test.source_dir, build_dir, mcu, toolchain, test.dependencies, options.options,
                                      linker_script=options.linker_script,
                                      clean=options.clean,

tools/options.py

@@ -57,6 +57,10 @@ def get_default_options_parser(add_clean=True, add_options=True):
     parser.add_argument("--cflags", default=[], action="append",
                         help="Extra flags to provide to the C compiler")
 
+    parser.add_argument("--cxxflags", default=[], dest="cxxflags",
+                        action="append",
+                        help="Extra flags to provide to the C++ compiler")
+
     parser.add_argument("--asmflags", default=[], action="append",
                         help="Extra flags to provide to the assembler")
 

tools/test.py

@@ -167,7 +167,8 @@
             library_build_success = False
             try:
                 extra_flags = {'cflags': options.cflags, 'asmflags': options.asmflags,
-                            'ldflags': options.ldflags}
+                               'ldflags': options.ldflags,
+                               'cxxflags': options.cxxflags}
                 # Build sources
                 build_library(base_source_paths, options.build_dir, mcu, toolchain,
                               options=options.options,
@@ -200,7 +201,8 @@
                 # Build all the tests
                 extra_flags = {'cflags': options.cflags,
                                'asmflags': options.asmflags,
-                               'ldflags': options.ldflags}
+                               'ldflags': options.ldflags,
+                               'cxxflags': options.cxxflags}
                 test_build_success, test_build = build_tests(
                     tests, [options.build_dir], options.build_dir, mcu, toolchain,
                     options=options.options,