Skip to content

Commit 4dbc587

Browse files
ian-twilightcoderian-twilightcoder
committed
[CMake] [Darwin] Don't add the Darwin overlay as a dependency if the overlays aren't being built
Allow for the overlays to not be built in Darwin by respecting SWIFT_BUILD_SDK_OVERLAY.
1 parent 41dc466 commit 4dbc587

File tree

9 files changed

+82
-39
lines changed

9 files changed

+82
-39
lines changed

‎stdlib/private/OSLog/CMakeLists.txt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
set(swift_oslog_darwin_dependencies "")
2+
if(SWIFT_BUILD_SDK_OVERLAY)
3+
list(APPEND swift_oslog_darwin_dependencies "Darwin")
4+
endif()
25
if (SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
36
list(APPEND swift_oslog_darwin_dependencies "_Concurrency")
47
endif()
@@ -22,11 +25,11 @@ add_swift_target_library(swiftOSLogTestHelper
2225
OSLogPrivacy.swift
2326
OSLogFloatFormatting.swift
2427

25-
SWIFT_MODULE_DEPENDS_IOS Darwin ${swift_oslog_darwin_dependencies}
26-
SWIFT_MODULE_DEPENDS_OSX Darwin ${swift_oslog_darwin_dependencies}
27-
SWIFT_MODULE_DEPENDS_TVOS Darwin ${swift_oslog_darwin_dependencies}
28-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin ${swift_oslog_darwin_dependencies}
29-
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin ${swift_oslog_darwin_dependencies}
28+
SWIFT_MODULE_DEPENDS_IOS ${swift_oslog_darwin_dependencies}
29+
SWIFT_MODULE_DEPENDS_OSX ${swift_oslog_darwin_dependencies}
30+
SWIFT_MODULE_DEPENDS_TVOS ${swift_oslog_darwin_dependencies}
31+
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_oslog_darwin_dependencies}
32+
SWIFT_MODULE_DEPENDS_MACCATALYST ${swift_oslog_darwin_dependencies}
3033
TARGET_SDKS ALL_APPLE_PLATFORMS
3134
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
3235
INSTALL_IN_COMPONENT never_install

‎stdlib/private/StdlibUnittest/CMakeLists.txt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
if(SWIFT_BUILD_SDK_OVERLAY)
2+
set(swift_stdlib_unittest_darwin_dependencies Darwin)
3+
else()
4+
set(swift_stdlib_unittest_darwin_dependencies)
5+
endif()
16

27
set(swift_stdlib_unittest_compile_flags
38
"-Xfrontend" "-disable-objc-attr-requires-foundation-module")
@@ -50,11 +55,11 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
5055
TypeIndexed.swift
5156

5257
SWIFT_MODULE_DEPENDS SwiftPrivate SwiftPrivateThreadExtras SwiftPrivateLibcExtras ${swift_stdlib_unittest_modules}
53-
SWIFT_MODULE_DEPENDS_IOS Darwin
54-
SWIFT_MODULE_DEPENDS_OSX Darwin
55-
SWIFT_MODULE_DEPENDS_TVOS Darwin
56-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
57-
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
58+
SWIFT_MODULE_DEPENDS_IOS ${swift_stdlib_unittest_darwin_dependencies}
59+
SWIFT_MODULE_DEPENDS_OSX ${swift_stdlib_unittest_darwin_dependencies}
60+
SWIFT_MODULE_DEPENDS_TVOS ${swift_stdlib_unittest_darwin_dependencies}
61+
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_stdlib_unittest_darwin_dependencies}
62+
SWIFT_MODULE_DEPENDS_MACCATALYST ${swift_stdlib_unittest_darwin_dependencies}
5863
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
5964
SWIFT_MODULE_DEPENDS_LINUX Glibc
6065
SWIFT_MODULE_DEPENDS_FREEBSD Glibc

‎stdlib/private/SwiftPrivate/CMakeLists.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ set(swift_swiftprivate_compile_flags
22
"-parse-stdlib"
33
"-Xfrontend" "-disable-access-control")
44

5+
if(SWIFT_BUILD_SDK_OVERLAY)
6+
set(swift_swiftprivate_darwin_depencencies Darwin)
7+
else()
8+
set(swift_swiftprivate_darwin_depencencies)
9+
endif()
10+
511
add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
612
# This file should be listed the first. Module name is inferred from the
713
# filename.
@@ -15,11 +21,11 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
1521
GYB_SOURCES
1622
AtomicInt.swift.gyb
1723

18-
SWIFT_MODULE_DEPENDS_OSX Darwin
19-
SWIFT_MODULE_DEPENDS_IOS Darwin
20-
SWIFT_MODULE_DEPENDS_TVOS Darwin
21-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
22-
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
24+
SWIFT_MODULE_DEPENDS_OSX ${swift_swiftprivate_darwin_depencencies}
25+
SWIFT_MODULE_DEPENDS_IOS ${swift_swiftprivate_darwin_depencencies}
26+
SWIFT_MODULE_DEPENDS_TVOS ${swift_swiftprivate_darwin_depencencies}
27+
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_swiftprivate_darwin_depencencies}
28+
SWIFT_MODULE_DEPENDS_MACCATALYST ${swift_swiftprivate_darwin_depencencies}
2329
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
2430
SWIFT_MODULE_DEPENDS_LINUX Glibc
2531
SWIFT_MODULE_DEPENDS_FREEBSD Glibc

‎stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ else()
1414
set(swift_private_libc_extras_incorporate_object_libraries "swiftCommandLineSupport")
1515
endif()
1616

17+
if(SWIFT_BUILD_SDK_OVERLAY)
18+
set(swift_private_libc_extras_darwin_depencencies Darwin)
19+
else()
20+
set(swift_private_libc_extras_darwin_depencencies)
21+
endif()
22+
1723
add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
1824
# This file should be listed the first. Module name is inferred from the
1925
# filename.
@@ -25,11 +31,11 @@ add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUIL
2531

2632
SWIFT_MODULE_DEPENDS SwiftPrivate
2733
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS} ${swift_private_libc_extras_flags}
28-
SWIFT_MODULE_DEPENDS_OSX Darwin
29-
SWIFT_MODULE_DEPENDS_IOS Darwin
30-
SWIFT_MODULE_DEPENDS_TVOS Darwin
31-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
32-
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
34+
SWIFT_MODULE_DEPENDS_OSX ${swift_private_libc_extras_darwin_depencencies}
35+
SWIFT_MODULE_DEPENDS_IOS ${swift_private_libc_extras_darwin_depencencies}
36+
SWIFT_MODULE_DEPENDS_TVOS ${swift_private_libc_extras_darwin_depencencies}
37+
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_private_libc_extras_darwin_depencencies}
38+
SWIFT_MODULE_DEPENDS_MACCATALYST ${swift_private_libc_extras_darwin_depencencies}
3339
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
3440
SWIFT_MODULE_DEPENDS_LINUX Glibc
3541
SWIFT_MODULE_DEPENDS_FREEBSD Glibc

‎stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
if(SWIFT_BUILD_SDK_OVERLAY)
2+
set(swift_private_thread_extras_darwin_depencencies Darwin)
3+
else()
4+
set(swift_private_thread_extras_darwin_depencencies)
5+
endif()
6+
17
add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
28
# This file should be listed the first. Module name is inferred from the
39
# filename.
@@ -6,11 +12,11 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
612

713
"${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
814

9-
SWIFT_MODULE_DEPENDS_IOS Darwin
10-
SWIFT_MODULE_DEPENDS_OSX Darwin
11-
SWIFT_MODULE_DEPENDS_TVOS Darwin
12-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
13-
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
15+
SWIFT_MODULE_DEPENDS_IOS ${swift_private_thread_extras_darwin_depencencies}
16+
SWIFT_MODULE_DEPENDS_OSX ${swift_private_thread_extras_darwin_depencencies}
17+
SWIFT_MODULE_DEPENDS_TVOS ${swift_private_thread_extras_darwin_depencencies}
18+
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_private_thread_extras_darwin_depencencies}
19+
SWIFT_MODULE_DEPENDS_MACCATALYST ${swift_private_thread_extras_darwin_depencencies}
1420
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
1521
SWIFT_MODULE_DEPENDS_LINUX Glibc
1622
SWIFT_MODULE_DEPENDS_FREEBSD Glibc

‎stdlib/private/SwiftReflectionTest/CMakeLists.txt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1+
if(SWIFT_BUILD_SDK_OVERLAY)
2+
set(swift_reflection_test_darwin_depencencies Darwin)
3+
else()
4+
set(swift_reflection_test_darwin_depencencies)
5+
endif()
16

27
if (SWIFT_INCLUDE_TESTS AND SWIFT_BUILD_DYNAMIC_STDLIB)
38
add_swift_target_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
49
SwiftReflectionTest.swift
510
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
611
SWIFT_COMPILE_FLAGS_LINUX -Xcc -D_GNU_SOURCE
7-
SWIFT_MODULE_DEPENDS_OSX Darwin
8-
SWIFT_MODULE_DEPENDS_IOS Darwin
9-
SWIFT_MODULE_DEPENDS_TVOS Darwin
10-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
12+
SWIFT_MODULE_DEPENDS_OSX ${swift_reflection_test_darwin_depencencies}
13+
SWIFT_MODULE_DEPENDS_IOS ${swift_reflection_test_darwin_depencencies}
14+
SWIFT_MODULE_DEPENDS_TVOS ${swift_reflection_test_darwin_depencencies}
15+
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_reflection_test_darwin_depencencies}
1116
SWIFT_MODULE_DEPENDS_LINUX Glibc
1217
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
1318
SWIFT_MODULE_DEPENDS_OPENBSD Glibc

‎stdlib/public/Cxx/std/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ add_dependencies(compiler CxxStdlib-apinotes)
2424
# is built with a different (older) version of the compiler. To workaround this,
2525
# declare the Darwin overlay as a dependency of CxxStdlib.
2626
set(swift_cxxstdlib_darwin_dependencies)
27-
if(SWIFT_BUILD_STDLIB AND (SWIFT_BUILD_SDK_OVERLAY OR SWIFT_BUILD_TEST_SUPPORT_MODULES))
27+
if(SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
2828
set(swift_cxxstdlib_darwin_dependencies Darwin)
2929
endif()
3030

‎stdlib/public/Differentiation/CMakeLists.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ else()
1616
set(swiftDifferentiationSIMDFiles)
1717
endif()
1818

19+
if(SWIFT_BUILD_SDK_OVERLAY)
20+
set(swiftDifferentiationDarwinDependencies Darwin)
21+
else()
22+
set(swiftDifferentiationDarwinDependencies)
23+
endif()
24+
1925
add_swift_target_library(swift_Differentiation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
2026
Differentiable.swift
2127
DifferentialOperators.swift
@@ -31,10 +37,10 @@ add_swift_target_library(swift_Differentiation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPE
3137
TgmathDerivatives.swift.gyb
3238
${swiftDifferentiationSIMDFiles}
3339

34-
SWIFT_MODULE_DEPENDS_OSX Darwin
35-
SWIFT_MODULE_DEPENDS_IOS Darwin
36-
SWIFT_MODULE_DEPENDS_TVOS Darwin
37-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
40+
SWIFT_MODULE_DEPENDS_OSX ${swiftDifferentiationDarwinDependencies}
41+
SWIFT_MODULE_DEPENDS_IOS ${swiftDifferentiationDarwinDependencies}
42+
SWIFT_MODULE_DEPENDS_TVOS ${swiftDifferentiationDarwinDependencies}
43+
SWIFT_MODULE_DEPENDS_WATCHOS ${swiftDifferentiationDarwinDependencies}
3844
SWIFT_MODULE_DEPENDS_LINUX Glibc
3945
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
4046
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
@@ -50,5 +56,5 @@ add_swift_target_library(swift_Differentiation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPE
5056
-parse-stdlib
5157
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
5258
INSTALL_IN_COMPONENT stdlib
53-
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
59+
SWIFT_MODULE_DEPENDS_MACCATALYST ${swiftDifferentiationDarwinDependencies}
5460
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/public/Distributed/CMakeLists.txt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
#
1111
#===----------------------------------------------------------------------===#
1212

13+
if(SWIFT_BUILD_SDK_OVERLAY)
14+
set(swift_distributed_darwin_depencencies Darwin)
15+
else()
16+
set(swift_distributed_darwin_depencencies)
17+
endif()
18+
1319
set(swift_distributed_link_libraries
1420
swiftCore)
1521

@@ -23,10 +29,10 @@ add_swift_target_library(swiftDistributed ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS
2329
DistributedMetadata.swift
2430
LocalTestingDistributedActorSystem.swift
2531

26-
SWIFT_MODULE_DEPENDS_IOS Darwin
27-
SWIFT_MODULE_DEPENDS_OSX Darwin
28-
SWIFT_MODULE_DEPENDS_TVOS Darwin
29-
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
32+
SWIFT_MODULE_DEPENDS_IOS ${swift_distributed_darwin_depencencies}
33+
SWIFT_MODULE_DEPENDS_OSX ${swift_distributed_darwin_depencencies}
34+
SWIFT_MODULE_DEPENDS_TVOS ${swift_distributed_darwin_depencencies}
35+
SWIFT_MODULE_DEPENDS_WATCHOS ${swift_distributed_darwin_depencencies}
3036
SWIFT_MODULE_DEPENDS_LINUX Glibc
3137
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
3238
SWIFT_MODULE_DEPENDS_OPENBSD Glibc

0 commit comments

Comments
 (0)