feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Better handling of build flags passed via environment vars // Resolve #526

Browse Source
This commit is contained in:
Valeriy Koval
2016-02-24 18:23:42 +02:00
parent caa0efd265
commit 1f1dc9c5e6
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platformio/builder/tools/platformio.py
View File

@ -96,9 +96,17 @@ def BuildProgram(env):
def ProcessFlags(env, flags): def ProcessFlags(env, flags):
for f in flags: parsed_flags = env.ParseFlags(flags)
if f: for flag in parsed_flags.pop("CPPDEFINES"):
env.MergeFlags(str(f)) if isinstance(flag, list):
env.Append(
CPPDEFINES=[
'-D%s=\\"%s\\"' % (flag[0], flag[1])
]
)
else:
env.Append(CPPDEFINES=flag)
env.Append(**parsed_flags)
# fix relative CPPPATH # fix relative CPPPATH
for i, p in enumerate(env.get("CPPPATH", [])): for i, p in enumerate(env.get("CPPPATH", [])):