Skip to content

Commit

Permalink
Update espidf.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason2866 authored Sep 9, 2024
1 parent 04cea2a commit 3d67767
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions builder/frameworks/espidf.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ def _extract_flags(config):
for cg in config["compileGroups"]:
flags[cg["language"]] = []
for ccfragment in cg["compileCommandFragments"]:
fragment = ccfragment.get("fragment", "")
if not fragment.strip() or fragment.startswith("-D"):
fragment = ccfragment.get("fragment", "").strip("\" ")
if not fragment or fragment.startswith("-D"):
continue
flags[cg["language"]].extend(
click.parser.split_arg_string(fragment.strip())
Expand Down Expand Up @@ -715,7 +715,7 @@ def prepare_build_envs(config, default_env, debug_allowed=True):
build_env = default_env.Clone()
build_env.SetOption("implicit_cache", 1)
for cc in compile_commands:
build_flags = cc.get("fragment")
build_flags = cc.get("fragment", "").strip("\" ")
if not build_flags.startswith("-D"):
if build_flags.startswith("-include") and ".." in build_flags:
source_index = cg.get("sourceIndexes")[0]
Expand Down Expand Up @@ -1264,7 +1264,7 @@ def _get_installed_pip_packages(python_exe_path):
"future": ">=0.18.3",
"pyparsing": ">=3.1.0,<4" if IDF5 else ">=2.0.3,<2.4.0",
"kconfiglib": "~=14.1.0" if IDF5 else "~=13.7.1",
"idf-component-manager": "~=1.5.2" if IDF5 else "~=1.0",
"idf-component-manager": "~=2.0.1" if IDF5 else "~=1.0",
"esp-idf-kconfig": ">=1.4.2,<2.0.0"
}

Expand Down

0 comments on commit 3d67767

Please sign in to comment.