Skip to content

Commit 1b83055

Browse files
committed
Remove generic compiler flags from global ASM scope
This way assembly sources that don't require preprocessing (.s) will be run without generic compiler flags. Issue #1314
1 parent 66d21ae commit 1b83055

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

builder/frameworks/espidf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ def _extract_flags(config):
430430

431431
# Flags are sorted because CMake randomly populates build flags in code model
432432
return {
433-
"ASFLAGS": sorted(app_flags.get("ASM", default_flags.get("ASM"))),
433+
"ASPPFLAGS": sorted(app_flags.get("ASM", default_flags.get("ASM"))),
434434
"CFLAGS": sorted(app_flags.get("C", default_flags.get("C"))),
435435
"CXXFLAGS": sorted(app_flags.get("CXX", default_flags.get("CXX"))),
436436
}
@@ -648,7 +648,7 @@ def prepare_build_envs(config, default_env, debug_allowed=True):
648648
parsed_flags = build_env.ParseFlags(build_flags)
649649
build_env.AppendUnique(**parsed_flags)
650650
if cg.get("language", "") == "ASM":
651-
build_env.AppendUnique(ASFLAGS=parsed_flags.get("CCFLAGS", []))
651+
build_env.AppendUnique(ASPPFLAGS=parsed_flags.get("CCFLAGS", []))
652652
build_env.AppendUnique(CPPDEFINES=defines, CPPPATH=includes)
653653
if sys_includes:
654654
build_env.Append(CCFLAGS=[("-isystem", inc) for inc in sys_includes])

0 commit comments

Comments
 (0)