Skip to content

Commit 1466a5e

Browse files
authored
Merge pull request #7147 from spevans/pr_link_args
Add dependancy for Linux static-stdlib link argument files
2 parents b78c24a + 86596a4 commit 1466a5e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

lib/Driver/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ if(SWIFT_BUILD_STATIC_STDLIB)
4444
"${ICU_UC_LIBDIR}"
4545
"${ICU_I18N_LIBDIR}"
4646
OUTPUT
47-
"${SWIFTSTATICLIB_DIR}/${linkfile}")
47+
"${SWIFTSTATICLIB_DIR}/${linkfile}"
48+
DEPENDS
49+
"${SWIFT_SOURCE_DIR}/utils/gen-static-stdlib-link-args")
4850

4951
list(APPEND static_stdlib_lnk_file_list ${swift_static_stdlib_${sdk}_args})
5052
swift_install_in_component(stdlib

stdlib/public/runtime/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ if(SWIFT_BUILD_STATIC_STDLIB AND "${sdk}" STREQUAL "LINUX")
102102
"${SWIFT_SOURCE_DIR}/utils/${lowercase}/static-executable-args.lnk"
103103
"${SWIFTSTATICLIB_DIR}/${linkfile}"
104104
OUTPUT
105-
"${SWIFTSTATICLIB_DIR}/${linkfile}")
105+
"${SWIFTSTATICLIB_DIR}/${linkfile}"
106+
DEPENDS
107+
"${SWIFT_SOURCE_DIR}/utils/${lowercase}/static-executable-args.lnk")
106108

107109
list(APPEND static_binary_lnk_file_list ${swift_static_binary_${sdk}_args})
108110
swift_install_in_component(stdlib

0 commit comments

Comments
 (0)