Skip to content

Commit 4db3175

Browse files
committed
Append build flags instead of replacing
1 parent 6e02bf5 commit 4db3175

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

mbed.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,19 @@ def process_global_lib(libname, mbed_config):
134134

135135
env.Replace(
136136
AS="$CC",
137-
ASCOM="$ASPPCOM",
137+
ASCOM="$ASPPCOM"
138+
)
139+
140+
env.Append(
138141
ASFLAGS=mbed_config.get("build_flags").get("asm") +
139142
mbed_config.get("build_flags").get("common"),
140143
CCFLAGS=mbed_config.get("build_flags").get("common"),
141144
CFLAGS=mbed_config.get("build_flags").get("c"),
142145
CXXFLAGS=mbed_config.get("build_flags").get("cxx"),
143146
LINKPPFLAGS=mbed_config.get("build_flags").get("ld"),
144147
LINKFLAGS=mbed_config.get("build_flags").get("ld"),
145-
LIBS=mbed_config.get("syslibs"))
148+
LIBS=mbed_config.get("syslibs")
149+
)
146150

147151
symbols = []
148152
for s in mbed_config.get("symbols"):
@@ -153,17 +157,11 @@ def process_global_lib(libname, mbed_config):
153157
else:
154158
symbols.append(s)
155159

156-
env.Replace(CPPDEFINES=symbols)
157-
158-
env.Append(LIBS=["c", "stdc++"]) # temporary fix for the linker issue
160+
env.Append(
161+
CPPDEFINES=symbols,
162+
LIBS=["c", "stdc++"] # temporary fix for the linker issue
163+
)
159164

160-
# restore external build flags
161-
if "build.extra_flags" in env.BoardConfig():
162-
env.ProcessFlags(env.BoardConfig().get("build.extra_flags"))
163-
# remove base flags
164-
env.ProcessUnFlags(env.get("BUILD_UNFLAGS"))
165-
# apply user flags
166-
env.ProcessFlags(env.get("BUILD_FLAGS"))
167165

168166
#
169167
# Process libraries

0 commit comments

Comments
 (0)