ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restore original compile sources routine

pull/1940/head
Mihail Stoyanov 2016-06-15 17:18:40 +01:00
parent 41daccf8d9
commit 99ed4e03f1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/build_api.py
View File

@ -236,8 +236,10 @@ def build_project(src_path, build_path, target, toolchain_name,
toolchain.add_macros(config.get_config_data_macros()) toolchain.add_macros(config.get_config_data_macros())
# Compile Sources # Compile Sources
objects = toolchain.compile_sources(resources, build_path, resources.inc_dirs) for path in src_paths:
resources.objects.extend(objects) src = toolchain.scan_resources(path)
objects = toolchain.compile_sources(src, build_path, resources.inc_dirs)
resources.objects.extend(objects)
# Link Program # Link Program
res, _ = toolchain.link_program(resources, build_path, name) res, _ = toolchain.link_program(resources, build_path, name)
@ -402,8 +404,10 @@ def build_library(src_paths, build_path, target, toolchain_name,
toolchain.add_macros(config.get_config_data_macros()) toolchain.add_macros(config.get_config_data_macros())
# Compile Sources # Compile Sources
objects = toolchain.compile_sources(resources, build_path, resources.inc_dirs) for path in src_paths:
resources.objects.extend(objects) src = toolchain.scan_resources(path)
objects = toolchain.compile_sources(src, abspath(tmp_path), resources.inc_dirs)
resources.objects.extend(objects)
if archive: if archive:
toolchain.build_library(objects, build_path, name) toolchain.build_library(objects, build_path, name)