Skip to content

Commit f8a5418

Browse files
etcwildeetcwilde
committed
Zipper all the things!
This patch goes through and adds zippering and the swift module dependencies to a bunch of pieces of the swift runtimes. Here's to hoping I hit everything that needed to be hit. :D With this patch, I'm seeing the appropriate modules under lib/swift/maccatalyst, so things seem to be working right.
1 parent 41d4171 commit f8a5418

File tree

15 files changed

+36
-18
lines changed

15 files changed

+36
-18
lines changed

‎stdlib/private/DifferentiationUnittest/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ add_swift_target_library(swiftDifferentiationUnittest ${SWIFT_STDLIB_LIBRARY_BUI
44

55
SWIFT_MODULE_DEPENDS _Differentiation StdlibUnittest
66
INSTALL_IN_COMPONENT stdlib-experimental
7-
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
7+
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
8+
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/private/OSLog/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ add_swift_target_library(swiftOSLogTestHelper
2626
SWIFT_MODULE_DEPENDS_OSX Darwin ${swift_oslog_darwin_dependencies}
2727
SWIFT_MODULE_DEPENDS_TVOS Darwin ${swift_oslog_darwin_dependencies}
2828
SWIFT_MODULE_DEPENDS_WATCHOS Darwin ${swift_oslog_darwin_dependencies}
29+
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin ${swift_oslog_darwin_dependencies}
2930
TARGET_SDKS ALL_APPLE_PLATFORMS
3031
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
3132
INSTALL_IN_COMPONENT never_install
32-
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
33+
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
34+
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/private/RuntimeUnittest/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ add_swift_target_library(swiftRuntimeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
1717
C_COMPILE_FLAGS -I${SWIFT_SOURCE_DIR}/stdlib/include
1818
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1919
INSTALL_IN_COMPONENT stdlib-experimental
20-
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
21-
20+
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
21+
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BU
2727
SWIFT_MODULE_DEPENDS_WINDOWS CRT
2828
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
2929
INSTALL_IN_COMPONENT stdlib-experimental
30-
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
31-
30+
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
31+
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD
1818
SWIFT_MODULE_DEPENDS_WINDOWS CRT
1919
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
2020
INSTALL_IN_COMPONENT stdlib-experimental
21-
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
22-
21+
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
22+
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/private/StdlibUnittest/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
5454
SWIFT_MODULE_DEPENDS_OSX Darwin
5555
SWIFT_MODULE_DEPENDS_TVOS Darwin
5656
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
57+
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
5758
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
5859
SWIFT_MODULE_DEPENDS_LINUX Glibc
5960
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
@@ -65,6 +66,7 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
6566
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
6667
INSTALL_IN_COMPONENT stdlib-experimental
6768
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
68-
LINK_LIBRARIES ${swift_stdlib_unittest_link_libraries})
69+
LINK_LIBRARIES ${swift_stdlib_unittest_link_libraries}
70+
MACCATALYST_BUILD_FLAVOR "zippered")
6971
set_source_files_properties(InspectValue.cpp PROPERTIES COMPILE_FLAGS -std=c++14)
7072

‎stdlib/private/SwiftPrivate/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
1919
SWIFT_MODULE_DEPENDS_IOS Darwin
2020
SWIFT_MODULE_DEPENDS_TVOS Darwin
2121
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
22+
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
2223
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
2324
SWIFT_MODULE_DEPENDS_LINUX Glibc
2425
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
@@ -28,5 +29,6 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
2829
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
2930
SWIFT_COMPILE_FLAGS ${swift_swiftprivate_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
3031
INSTALL_IN_COMPONENT stdlib-experimental
31-
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
32-
32+
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
33+
MACCATALYST_BUILD_FLAVOR "zippered"
34+
)

‎stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUIL
2929
SWIFT_MODULE_DEPENDS_IOS Darwin
3030
SWIFT_MODULE_DEPENDS_TVOS Darwin
3131
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
32+
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
3233
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
3334
SWIFT_MODULE_DEPENDS_LINUX Glibc
3435
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
@@ -38,4 +39,5 @@ add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUIL
3839
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
3940
INCORPORATE_OBJECT_LIBRARIES ${swift_private_libc_extras_incorporate_object_libraries}
4041
INSTALL_IN_COMPONENT stdlib-experimental
41-
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
42+
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
43+
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
1010
SWIFT_MODULE_DEPENDS_OSX Darwin
1111
SWIFT_MODULE_DEPENDS_TVOS Darwin
1212
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
13+
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
1314
SWIFT_MODULE_DEPENDS_FREESTANDING "${SWIFT_FREESTANDING_TEST_DEPENDENCIES}"
1415
SWIFT_MODULE_DEPENDS_LINUX Glibc
1516
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
@@ -19,5 +20,5 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
1920
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
2021
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
2122
INSTALL_IN_COMPONENT stdlib-experimental
22-
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
23-
23+
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"
24+
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/public/Concurrency/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,5 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
149149
${SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS}
150150
${swift_concurrency_options}
151151
INSTALL_IN_COMPONENT ${swift_concurrency_install_component}
152+
MACCATALYST_BUILD_FLAVOR zippered
152153
)

‎stdlib/public/Differentiation/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,6 @@ add_swift_target_library(swift_Differentiation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPE
4848
${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
4949
-parse-stdlib
5050
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
51-
INSTALL_IN_COMPONENT stdlib)
51+
INSTALL_IN_COMPONENT stdlib
52+
SWIFT_MODULE_DEPENDS_MACCATALYST Darwin
53+
MACCATALYST_BUILD_FLAVOR "zippered")

‎stdlib/public/Platform/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ endif()
7474
add_swift_target_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
7575
${swiftDarwin_common_options}
7676
TARGET_SDKS "${swiftDarwin_target_sdks}"
77-
INSTALL_IN_COMPONENT sdk-overlay)
77+
INSTALL_IN_COMPONENT sdk-overlay
78+
MACCATALYST_BUILD_FLAVOR "zippered")
7879

7980
set(swiftGlibc_target_sdks ANDROID CYGWIN FREEBSD OPENBSD LINUX HAIKU)
8081
if(SWIFT_FREESTANDING_FLAVOR STREQUAL "linux")

‎stdlib/public/RegexParser/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,5 @@ add_swift_target_library(swift_RegexParser ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
4949
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
5050

5151
INSTALL_IN_COMPONENT stdlib
52+
MACCATALYST_BUILD_FLAVOR "zippered"
5253
)

‎stdlib/public/StringProcessing/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,5 @@ add_swift_target_library(swift_StringProcessing ${SWIFT_STDLIB_LIBRARY_BUILD_TYP
5353

5454
SWIFT_MODULE_DEPENDS _RegexParser
5555
INSTALL_IN_COMPONENT stdlib
56+
MACCATALYST_BUILD_FLAVOR "zippered"
5657
)

‎stdlib/public/core/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -373,5 +373,7 @@ add_swift_target_library(swiftCore
373373
FILE_DEPENDS
374374
${swiftCore_common_dependencies}
375375
INSTALL_IN_COMPONENT
376-
stdlib)
377-
376+
stdlib
377+
MACCATALYST_BUILD_FLAVOR
378+
zippered
379+
)

0 commit comments

Comments
 (0)