Skip to content

Commit 9d7d3a1

Browse files
edymttedymtt
authored
Merge pull request #83602 from edymtt/edymtt/ensure-private-libraries-can-run-on-older-oses
CMake: allow private libraries to be used on older OSes
2 parents fef7f53 + 1034a7a commit 9d7d3a1

File tree

6 files changed

+37
-3
lines changed

6 files changed

+37
-3
lines changed

‎stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BU
2727
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
2828
SWIFT_MODULE_DEPENDS_HAIKU Glibc
2929
SWIFT_MODULE_DEPENDS_WINDOWS CRT
30+
31+
DEPLOYMENT_VERSION_OSX ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_OSX}
32+
DEPLOYMENT_VERSION_IOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_IOS}
33+
DEPLOYMENT_VERSION_TVOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_TVOS}
34+
DEPLOYMENT_VERSION_WATCHOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_WATCHOS}
35+
DEPLOYMENT_VERSION_XROS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_XROS}
36+
3037
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
3138
INSTALL_IN_COMPONENT stdlib-experimental
3239
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"

‎stdlib/private/StdlibUnittest/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ if (SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY)
3737
list(APPEND swift_stdlib_unittest_link_libraries "swift_Concurrency")
3838
list(APPEND swift_stdlib_unittest_modules "_Concurrency")
3939
endif()
40-
if (SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
41-
list(APPEND swift_stdlib_unittest_modules "_StringProcessing")
42-
endif()
4340

4441
add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
4542
# This file should be listed the first. Module name is inferred from the
@@ -79,6 +76,13 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
7976
SWIFT_MODULE_DEPENDS_HAIKU Glibc
8077
SWIFT_MODULE_DEPENDS_WASI WASILibc
8178
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
79+
80+
DEPLOYMENT_VERSION_OSX ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_OSX}
81+
DEPLOYMENT_VERSION_IOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_IOS}
82+
DEPLOYMENT_VERSION_TVOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_TVOS}
83+
DEPLOYMENT_VERSION_WATCHOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_WATCHOS}
84+
DEPLOYMENT_VERSION_XROS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_XROS}
85+
8286
C_COMPILE_FLAGS -I${SWIFT_SOURCE_DIR}/stdlib/include
8387
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
8488
INSTALL_IN_COMPONENT stdlib-experimental

‎stdlib/private/SwiftPrivate/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
4141
SWIFT_MODULE_DEPENDS_HAIKU Glibc
4242
SWIFT_MODULE_DEPENDS_WASI WASILibc
4343
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
44+
45+
DEPLOYMENT_VERSION_OSX ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_OSX}
46+
DEPLOYMENT_VERSION_IOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_IOS}
47+
DEPLOYMENT_VERSION_TVOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_TVOS}
48+
DEPLOYMENT_VERSION_WATCHOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_WATCHOS}
49+
DEPLOYMENT_VERSION_XROS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_XROS}
50+
4451
SWIFT_COMPILE_FLAGS ${swift_swiftprivate_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
4552
INSTALL_IN_COMPONENT stdlib-experimental
4653
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"

‎stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUIL
5252
SWIFT_MODULE_DEPENDS_HAIKU Glibc
5353
SWIFT_MODULE_DEPENDS_WASI WASILibc
5454
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
55+
56+
DEPLOYMENT_VERSION_OSX ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_OSX}
57+
DEPLOYMENT_VERSION_IOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_IOS}
58+
DEPLOYMENT_VERSION_TVOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_TVOS}
59+
DEPLOYMENT_VERSION_WATCHOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_WATCHOS}
60+
DEPLOYMENT_VERSION_XROS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_XROS}
61+
5562
INCORPORATE_OBJECT_LIBRARIES ${swift_private_libc_extras_incorporate_object_libraries}
5663
INSTALL_IN_COMPONENT stdlib-experimental
5764
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"

‎stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
3333
SWIFT_MODULE_DEPENDS_HAIKU Glibc
3434
SWIFT_MODULE_DEPENDS_WASI WASILibc
3535
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
36+
37+
DEPLOYMENT_VERSION_OSX ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_OSX}
38+
DEPLOYMENT_VERSION_IOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_IOS}
39+
DEPLOYMENT_VERSION_TVOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_TVOS}
40+
DEPLOYMENT_VERSION_WATCHOS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_WATCHOS}
41+
DEPLOYMENT_VERSION_XROS ${SWIFT_DARWIN_TEST_DEPLOYMENT_VERSION_XROS}
42+
3643
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
3744
INSTALL_IN_COMPONENT stdlib-experimental
3845
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"

‎test/AutoDiff/compiler_crashers_fixed/issue-56600-symbol-in-ir-file-not-tbd-file.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// RUN: %target-run-simple-swift
22

33
// REQUIRES: executable_test
4+
// UNSUPPORTED: use_os_stdlib
5+
// UNSUPPORTED: back_deployment_runtime
46

57
// https://github.com/apple/swift/issues/56600
68
// Error: symbol 'powTJfSSpSr' (powTJfSSpSr) is in generated IR file, but not

0 commit comments

Comments
 (0)