From 72cb2f1240ca78cbb6e545b03e5a941d1d710d67 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Tue, 1 Mar 2016 12:58:54 +0200 Subject: [PATCH] Put parsed mbed flags to appropriate scope --- platformio/builder/scripts/frameworks/mbed.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platformio/builder/scripts/frameworks/mbed.py b/platformio/builder/scripts/frameworks/mbed.py index c76202b8..4bfc53cc 100644 --- a/platformio/builder/scripts/frameworks/mbed.py +++ b/platformio/builder/scripts/frameworks/mbed.py @@ -188,10 +188,10 @@ def get_build_flags(data): flags = {} cflags = set(data.get("CFLAGS", [])) cxxflags = set(data.get("CXXFLAGS", [])) - cppflags = set(cflags & cxxflags) - flags['CPPFLAGS'] = list(cppflags) - flags['CXXFLAGS'] = list(cxxflags - cppflags) - flags['CFLAGS'] = list(cflags - cppflags) + ccflags = set(cflags & cxxflags) + flags['CCFLAGS'] = list(ccflags) + flags['CXXFLAGS'] = list(cxxflags - ccflags) + flags['CFLAGS'] = list(cflags - ccflags) return flags @@ -221,7 +221,7 @@ variant_dir = join("$PLATFORMFW_DIR", "variant", variant) env.Replace( _mbed_whole_archive_hook=_mbed_whole_archive_hook, _LIBFLAGS="${_mbed_whole_archive_hook(%s)}" % env.get("_LIBFLAGS")[2:-1], - CPPFLAGS=build_flags.get("CPPFLAGS", []), + CCFLAGS=build_flags.get("CCFLAGS", []), CFLAGS=build_flags.get("CFLAGS", []), CXXFLAGS=build_flags.get("CXXFLAGS", []), LINKFLAGS=eixdata.get("LINKFLAGS", []),