Skip to content

Commit be6181b

Browse files
authored
Merge pull request #37953 from mikeash/move-SwiftNativeNSObject-5.5
[5.5][Stdlib] Move SwiftNativeNSObject to libswiftCore.
2 parents 8b03396 + f056366 commit be6181b

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

stdlib/public/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set(SWIFT_RUNTIME_CXX_FLAGS)
44
set(SWIFT_RUNTIME_LINK_FLAGS)
55
set(SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS)
66
set(SWIFT_RUNTIME_SWIFT_LINK_FLAGS)
7+
set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS)
78

89
if(SWIFT_RUNTIME_USE_SANITIZERS)
910
# TODO: Refactor this
@@ -117,3 +118,9 @@ if(SWIFT_BUILD_SDK_OVERLAY)
117118
endif()
118119
endif()
119120

121+
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
122+
list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS
123+
"-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/Concurrency/ReexportedSymbols")
124+
endif()
125+
126+
list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")

stdlib/public/Concurrency/CMakeLists.txt

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

13-
set(swift_concurrency_objc_sources
14-
SwiftNativeNSObject.mm)
15-
1613
set(LLVM_OPTIONAL_SOURCES
1714
${swift_concurrency_objc_sources})
1815

@@ -93,6 +90,6 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
9390
-Xfrontend -enable-experimental-concurrency
9491
-Xfrontend -define-availability
9592
-Xfrontend \"SwiftStdlib 5.5:macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0\"
96-
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
93+
LINK_FLAGS "${SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS}"
9794
INSTALL_IN_COMPONENT stdlib
9895
)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
_OBJC_CLASS_$_SwiftNativeNSObject
2+
_OBJC_METACLASS_$_SwiftNativeNSObject

stdlib/public/stubs/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ set(swift_stubs_objc_sources
1313
FoundationHelpers.mm
1414
OptionalBridgingHelper.mm
1515
Reflection.mm
16+
SwiftNativeNSObject.mm
1617
SwiftNativeNSXXXBaseARC.m)
1718
set(swift_stubs_gyb_sources
1819
SwiftNativeNSXXXBase.mm.gyb)

0 commit comments

Comments
 (0)