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

Merge pull request #4413 from theotherjimmy/fix-dep-bug 

Fix a bug in dependency handling
pull/4422/head
Martin Kojtal 2017-06-01 14:06:46 +02:00 committed by GitHub
parent 3553a4573a 4806229090
commit 9381a7af06
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/toolchains/__init__.py
View File

@ -914,7 +914,7 @@ class mbedToolchain:
deps = []
config_file = ([self.config.app_config_location]
if self.config.app_config_location else [])
deps.append(config_file)
deps.extend(config_file)
if ext == '.cpp' or self.COMPILE_C_AS_CPP:
deps.append(join(self.build_dir, self.PROFILE_FILE_NAME + "-cxx"))
else:
@ -1021,7 +1021,7 @@ class mbedToolchain:
r.objects = sorted(set(r.objects))
config_file = ([self.config.app_config_location]
if self.config.app_config_location else [])
dependencies = r.objects + r.libraries + [r.linker_script, config_file]
dependencies = r.objects + r.libraries + [r.linker_script] + config_file
dependencies.append(join(self.build_dir, self.PROFILE_FILE_NAME + "-ld"))
if self.need_update(elf, dependencies):
needed_update = True