Skip to content

[CMake] Use CXX linker for Core and Concurrency #80139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2025
Merged

[CMake] Use CXX linker for Core and Concurrency #80139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Runtimes/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# -- Will need shadow invocations to generate swiftmodules for Swift parts
# Install *.abi.json, swiftdoc, and swiftsourceinfo

cmake_minimum_required(VERSION 3.26...3.29)
cmake_minimum_required(VERSION 3.29)

set(CMAKE_C_VISIBILITY_PRESET "hidden")
set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Core/Concurrency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ target_link_libraries(swift_Concurrency PRIVATE
# Link to the runtime that we are just building.
swiftCore)
set_target_properties(swift_Concurrency PROPERTIES
Swift_MODULE_NAME _Concurrency)
Swift_MODULE_NAME _Concurrency
LINKER_LANGUAGE CXX)

install(TARGETS swift_Concurrency
EXPORT SwiftCoreTargets
Expand Down
4 changes: 3 additions & 1 deletion Runtimes/Core/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,9 @@ if(SwiftCore_ENABLE_VECTOR_TYPES)
"${CMAKE_CURRENT_BINARY_DIR}/SIMDVectorTypes.swift")
endif()

set_target_properties(swiftCore PROPERTIES Swift_MODULE_NAME Swift)
set_target_properties(swiftCore PROPERTIES
Swift_MODULE_NAME Swift
LINKER_LANGUAGE CXX)

target_compile_definitions(swiftCore
PRIVATE
Expand Down