Skip to content

Commit 126859d

Browse files
committed
Treat extra items to dependencies generation as dependencies instead of extra source files
1 parent 7dea0e9 commit 126859d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lib/phases.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,17 @@ def product(self):
3030
def set_product(self, product):
3131
self._product = product
3232

33-
def generate_dependencies(self):
33+
def generate_dependencies(self, extra = None):
3434
if self.dependencies is not None and len(self.dependencies) > 0:
3535
rule = " |"
3636
for dep in self.dependencies:
3737
rule += " " + dep.name
38+
if extra is not None:
39+
rule += " " + extra
3840
return rule
3941
else:
42+
if extra is not None:
43+
return " | " + extra
4044
return ""
4145

4246
def add_dependency(self, phase):
@@ -415,7 +419,7 @@ def generate(self):
415419
swiftSources += " " + resource.relative()
416420

417421
return """
418-
build """ + appName + """: SwiftExecutable """ + swiftSources + self.generate_dependencies() + """ """ + libDependencyName + """
422+
build """ + appName + """: SwiftExecutable """ + swiftSources + self.generate_dependencies(libDependencyName) + """
419423
flags = -I""" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + self.product.ROOT_HEADERS_FOLDER_PATH + " -I" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + " -L" + Configuration.current.build_directory.path_by_appending(self.product.name).relative() + " " + TargetConditional.value(self.product.SWIFTCFLAGS) + """
420424
build """ + self.executableName + """: phony | """ + appName + """
421425
"""

0 commit comments

Comments
 (0)