platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Put parsed mbed flags to appropriate scope

Browse Source
This commit is contained in:
Valeriy Koval
2016-03-01 12:58:54 +02:00
parent 9473e51e40
commit 72cb2f1240
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platformio/builder/scripts/frameworks/mbed.py
View File

@ -188,10 +188,10 @@ def get_build_flags(data):
flags = {} flags = {}
cflags = set(data.get("CFLAGS", [])) cflags = set(data.get("CFLAGS", []))
cxxflags = set(data.get("CXXFLAGS", [])) cxxflags = set(data.get("CXXFLAGS", []))
cppflags = set(cflags & cxxflags) ccflags = set(cflags & cxxflags)
flags['CPPFLAGS'] = list(cppflags) flags['CCFLAGS'] = list(ccflags)
flags['CXXFLAGS'] = list(cxxflags - cppflags) flags['CXXFLAGS'] = list(cxxflags - ccflags)
flags['CFLAGS'] = list(cflags - cppflags) flags['CFLAGS'] = list(cflags - ccflags)
return flags return flags
@ -221,7 +221,7 @@ variant_dir = join("$PLATFORMFW_DIR", "variant", variant)
env.Replace( env.Replace(
_mbed_whole_archive_hook=_mbed_whole_archive_hook, _mbed_whole_archive_hook=_mbed_whole_archive_hook,
_LIBFLAGS="${_mbed_whole_archive_hook(%s)}" % env.get("_LIBFLAGS")[2:-1], _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", []), CFLAGS=build_flags.get("CFLAGS", []),
CXXFLAGS=build_flags.get("CXXFLAGS", []), CXXFLAGS=build_flags.get("CXXFLAGS", []),
LINKFLAGS=eixdata.get("LINKFLAGS", []), LINKFLAGS=eixdata.get("LINKFLAGS", []),