Skip to content

Commit 4288ab4

Browse files
committed
Ensure that the _Concurrency library re-exportes SwiftNativeNSObject.
The CMake variables to control this were set *after* the inclusion of the Concurrency library, so they didn't have any effect.
1 parent 7cc9a72 commit 4288ab4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

stdlib/public/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_REMOTE_MIRROR)
8383
INSTALL_IN_COMPONENT never_install)
8484
endif()
8585

86+
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
87+
list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS
88+
"-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/Concurrency/ReexportedSymbols")
89+
endif()
90+
91+
list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")
92+
8693
if(SWIFT_BUILD_STDLIB)
8794
# These must be kept in dependency order so that any referenced targets
8895
# exist at the time we look for them in add_swift_*.
@@ -117,10 +124,3 @@ if(SWIFT_BUILD_SDK_OVERLAY)
117124
add_subdirectory(Windows)
118125
endif()
119126
endif()
120-
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}")

0 commit comments

Comments
 (0)