Fix issue with "-L relative/path" when parsing "build_flags" // Resolve #688

This commit is contained in:
Ivan Kravets
2016-06-10 19:54:17 +03:00
parent 4b093dcdbb
commit f6088cbbe1
2 changed files with 7 additions and 4 deletions

View File

@ -15,6 +15,8 @@ PlatformIO 2.0
(`issue #683 <https://github.com/platformio/platformio/issues/683>`_) (`issue #683 <https://github.com/platformio/platformio/issues/683>`_)
* Added support for `Arduboy DevKit <https://www.arduboy.com>`__, the game system * Added support for `Arduboy DevKit <https://www.arduboy.com>`__, the game system
the size of a credit card the size of a credit card
* Fixed issue with ``-L relative/path`` when parsing ``build_flags``
(`issue #688 <https://github.com/platformio/platformio/issues/688>`_)
2.9.4 (2016-06-04) 2.9.4 (2016-06-04)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

View File

@ -114,10 +114,11 @@ def ProcessFlags(env, flags):
env.Append(CPPDEFINES=[flag]) env.Append(CPPDEFINES=[flag])
env.Append(**parsed_flags) env.Append(**parsed_flags)
# fix relative CPPPATH # fix relative CPPPATH & LIBPATH
for i, p in enumerate(env.get("CPPPATH", [])): for k in ("CPPPATH", "LIBPATH"):
if isdir(p): for i, p in enumerate(env.get(k, [])):
env['CPPPATH'][i] = realpath(p) if isdir(p):
env[k][i] = realpath(p)
# fix relative path for "-include" # fix relative path for "-include"
for i, f in enumerate(env.get("CCFLAGS", [])): for i, f in enumerate(env.get("CCFLAGS", [])):
if isinstance(f, tuple) and f[0] == "-include": if isinstance(f, tuple) and f[0] == "-include":