@@ -134,15 +134,19 @@ def process_global_lib(libname, mbed_config):
134
134
135
135
env .Replace (
136
136
AS = "$CC" ,
137
- ASCOM = "$ASPPCOM" ,
137
+ ASCOM = "$ASPPCOM"
138
+ )
139
+
140
+ env .Append (
138
141
ASFLAGS = mbed_config .get ("build_flags" ).get ("asm" ) +
139
142
mbed_config .get ("build_flags" ).get ("common" ),
140
143
CCFLAGS = mbed_config .get ("build_flags" ).get ("common" ),
141
144
CFLAGS = mbed_config .get ("build_flags" ).get ("c" ),
142
145
CXXFLAGS = mbed_config .get ("build_flags" ).get ("cxx" ),
143
146
LINKPPFLAGS = mbed_config .get ("build_flags" ).get ("ld" ),
144
147
LINKFLAGS = mbed_config .get ("build_flags" ).get ("ld" ),
145
- LIBS = mbed_config .get ("syslibs" ))
148
+ LIBS = mbed_config .get ("syslibs" )
149
+ )
146
150
147
151
symbols = []
148
152
for s in mbed_config .get ("symbols" ):
@@ -153,17 +157,11 @@ def process_global_lib(libname, mbed_config):
153
157
else :
154
158
symbols .append (s )
155
159
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
+ )
159
164
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" ))
167
165
168
166
#
169
167
# Process libraries
0 commit comments