Skip to content

Commit fb8ec6f

Browse files
authored
Merge pull request swiftlang#39590 from DougGregor/revert-nativensobject-backdeploy
Stop re-exporting SwiftNativeNSObject from _Concurrency
2 parents 4e2b158 + 5868ae9 commit fb8ec6f

File tree

3 files changed

+0
-11
lines changed

3 files changed

+0
-11
lines changed

stdlib/public/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ 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)
87

98
if(SWIFT_RUNTIME_USE_SANITIZERS)
109
# TODO: Refactor this
@@ -79,13 +78,6 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_REMOTE_MIRROR)
7978
INSTALL_IN_COMPONENT never_install)
8079
endif()
8180

82-
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
83-
list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS
84-
"-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/Concurrency/ReexportedSymbols")
85-
endif()
86-
87-
list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")
88-
8981
if(SWIFT_BUILD_STDLIB)
9082
# These must be kept in dependency order so that any referenced targets
9183
# exist at the time we look for them in add_swift_*.

stdlib/public/Concurrency/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
130130
-Xfrontend -define-availability
131131
-Xfrontend "SwiftStdlib 5.5:macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0"
132132
${SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS}
133-
LINK_FLAGS "${SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS}"
134133
${swift_concurrency_options}
135134
INSTALL_IN_COMPONENT ${swift_concurrency_install_component}
136135
)

stdlib/public/Concurrency/ReexportedSymbols

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)