Skip to content

Commit 9381a7a

Browse files
authored
Merge pull request #4413 from theotherjimmy/fix-dep-bug
Fix a bug in dependency handling
2 parents 3553a45 + 4806229 commit 9381a7a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/toolchains/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ def compile_command(self, source, object, includes):
914914
deps = []
915915
config_file = ([self.config.app_config_location]
916916
if self.config.app_config_location else [])
917-
deps.append(config_file)
917+
deps.extend(config_file)
918918
if ext == '.cpp' or self.COMPILE_C_AS_CPP:
919919
deps.append(join(self.build_dir, self.PROFILE_FILE_NAME + "-cxx"))
920920
else:
@@ -1021,7 +1021,7 @@ def link_program(self, r, tmp_path, name):
10211021
r.objects = sorted(set(r.objects))
10221022
config_file = ([self.config.app_config_location]
10231023
if self.config.app_config_location else [])
1024-
dependencies = r.objects + r.libraries + [r.linker_script, config_file]
1024+
dependencies = r.objects + r.libraries + [r.linker_script] + config_file
10251025
dependencies.append(join(self.build_dir, self.PROFILE_FILE_NAME + "-ld"))
10261026
if self.need_update(elf, dependencies):
10271027
needed_update = True

0 commit comments

Comments
 (0)