Skip to content

Commit 6968202

Browse files
shahmishalshahmishal
authored
Merge pull request #76980 from al45tair/eng/PR-136208589-6.0.2
[Build] Make sure we declare LINUX_STATIC dependencies on Musl.
2 parents 0ba79e4 + 0cf59e9 commit 6968202

File tree

9 files changed

+9
-0
lines changed

9 files changed

+9
-0
lines changed

‎stdlib/private/RuntimeUnittest/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ add_swift_target_library(swiftRuntimeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
1010
SWIFT_MODULE_DEPENDS StdlibUnittest
1111
SWIFT_MODULE_DEPENDS_ANDROID Android
1212
SWIFT_MODULE_DEPENDS_LINUX Glibc
13+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
1314
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
1415
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
1516
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

‎stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BU
2121
SWIFT_MODULE_DEPENDS StdlibUnittest
2222
SWIFT_MODULE_DEPENDS_ANDROID Android
2323
SWIFT_MODULE_DEPENDS_LINUX Glibc
24+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
2425
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
2526
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
2627
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

‎stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD
1212
SWIFT_MODULE_DEPENDS StdlibUnittest
1313
SWIFT_MODULE_DEPENDS_ANDROID Android
1414
SWIFT_MODULE_DEPENDS_LINUX Glibc
15+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
1516
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
1617
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
1718
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

‎stdlib/private/StdlibUnittest/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
6464
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
6565
SWIFT_MODULE_DEPENDS_ANDROID Android
6666
SWIFT_MODULE_DEPENDS_LINUX Glibc
67+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
6768
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
6869
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
6970
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

‎stdlib/public/Concurrency/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
159159

160160
SWIFT_MODULE_DEPENDS_ANDROID Android
161161
SWIFT_MODULE_DEPENDS_LINUX Glibc
162+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
162163
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
163164
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
164165
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

‎stdlib/public/Distributed/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ add_swift_target_library(swiftDistributed ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS
3636
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_distributed_darwin_depencencies}
3737
SWIFT_MODULE_DEPENDS_ANDROID Android
3838
SWIFT_MODULE_DEPENDS_LINUX Glibc
39+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
3940
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
4041
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
4142
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

‎stdlib/public/RegexBuilder/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ add_swift_target_library(swiftRegexBuilder ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
2929

3030
SWIFT_MODULE_DEPENDS_ANDROID Android
3131
SWIFT_MODULE_DEPENDS_LINUX Glibc
32+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
3233
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
3334
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
3435
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

‎stdlib/public/RegexParser/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ add_swift_target_library(swift_RegexParser ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
3131
"${MATCHING_ENGINE_SOURCES}"
3232

3333
SWIFT_MODULE_DEPENDS_LINUX Glibc
34+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
3435
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
3536
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
3637
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

‎stdlib/public/StringProcessing/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ add_swift_target_library(swift_StringProcessing ${SWIFT_STDLIB_LIBRARY_BUILD_TYP
4343

4444
SWIFT_MODULE_DEPENDS_ANDROID Android
4545
SWIFT_MODULE_DEPENDS_LINUX Glibc
46+
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
4647
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
4748
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
4849
SWIFT_MODULE_DEPENDS_CYGWIN Glibc

0 commit comments

Comments
 (0)