Skip to content

Commit f6acb1f

Browse files
committed
Forward ported changes to tools
1 parent 51c1016 commit f6acb1f

File tree

7 files changed

+295
-278
lines changed

7 files changed

+295
-278
lines changed

tools/build_api.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ def build_project(src_path, build_path, target, toolchain_name,
207207
resources.objects.extend(objects)
208208

209209
# Link Program
210-
res, needed_update = toolchain.link_program(resources, build_path, name)
210+
res, _ = toolchain.link_program(resources, build_path, name)
211211

212-
if report != None and needed_update:
212+
if report != None:
213213
end = time()
214214
cur_result["elapsed_time"] = end - start
215215
cur_result["output"] = toolchain.get_output()
@@ -234,8 +234,6 @@ def build_project(src_path, build_path, target, toolchain_name,
234234
if toolchain_output:
235235
cur_result["output"] += toolchain_output
236236

237-
cur_result["output"] += str(e)
238-
239237
add_result_to_report(report, cur_result)
240238

241239
# Let Exception propagate
@@ -360,11 +358,9 @@ def build_library(src_paths, build_path, target, toolchain_name,
360358
resources.objects.extend(objects)
361359

362360
if archive:
363-
needed_update = toolchain.build_library(resources.objects, build_path, name)
364-
else:
365-
needed_update = True
361+
toolchain.build_library(objects, build_path, name)
366362

367-
if report != None and needed_update:
363+
if report != None:
368364
end = time()
369365
cur_result["elapsed_time"] = end - start
370366
cur_result["output"] = toolchain.get_output()
@@ -623,12 +619,12 @@ def build_mbed_libs(target, toolchain_name, options=None, verbose=False, clean=F
623619
for o in separate_objects:
624620
objects.remove(o)
625621

626-
needed_update = toolchain.build_library(objects, BUILD_TOOLCHAIN, "mbed")
622+
toolchain.build_library(objects, BUILD_TOOLCHAIN, "mbed")
627623

628624
for o in separate_objects:
629625
toolchain.copy_files(o, BUILD_TOOLCHAIN)
630626

631-
if report != None and needed_update:
627+
if report != None:
632628
end = time()
633629
cur_result["elapsed_time"] = end - start
634630
cur_result["output"] = toolchain.get_output()

0 commit comments

Comments
 (0)