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

Fixed handling of `-include` flag // Resolve #4683

Browse Source
This commit is contained in:
Ivan Kravets
2023-07-06 13:42:19 +03:00
parent 5396882e75
commit 9585e2a3e3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platformio/builder/tools/piobuild.py
View File

@ -201,13 +201,13 @@ def ParseFlagsExtended(env, flags): # pylint: disable=too-many-branches
for k in ("CPPPATH", "LIBPATH"): for k in ("CPPPATH", "LIBPATH"):
for i, p in enumerate(result.get(k, [])): for i, p in enumerate(result.get(k, [])):
p = env.subst(p) p = env.subst(p)
result[k][i] = p if os.path.isabs(p) else env.Dir(f"#{p}") if os.path.isdir(p):
result[k][i] = os.path.abspath(p)
# fix relative path for "-include" # fix relative path for "-include"
for i, f in enumerate(result.get("CCFLAGS", [])): for i, f in enumerate(result.get("CCFLAGS", [])):
if isinstance(f, tuple) and f[0] == "-include": if isinstance(f, tuple) and f[0] == "-include":
p = env.subst(f[1].get_path()) result["CCFLAGS"][i] = (f[0], env.subst(f[1].get_path()))
result["CCFLAGS"][i] = (f[0], p if os.path.isabs(p) else env.File(f"#{p}"))
return result return result

2
tests/commands/test_run.py
View File

@ -25,7 +25,7 @@ def test_generic_build(clirunner, validate_cliresult, tmpdir):
("-Iinclude", "-Iinclude"), ("-Iinclude", "-Iinclude"),
("-include cpppath-include.h", "cpppath-include.h"), ("-include cpppath-include.h", "cpppath-include.h"),
("-Iextra_inc", "-Iextra_inc"), ("-Iextra_inc", "-Iextra_inc"),
("-Inon-existing-dir", "-Inon-existing-dir"), ("-Inon-existing-dir", "non-existing-dir"),
( (
"-include $PROJECT_DIR/lib/component/component-forced-include.h", "-include $PROJECT_DIR/lib/component/component-forced-include.h",
"component-forced-include.h", "component-forced-include.h",