Skip to content

[Debugging] Use SWIFT_NATIVE_SWIFT_TOOLS_PATH if defined #71814

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 2 commits into from
Feb 23, 2024
Merged

[Debugging] Use SWIFT_NATIVE_SWIFT_TOOLS_PATH if defined #71814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc302ff
[Debugging] Use SWIFT_NATIVE_SWIFT_TOOLS_PATH if defined
kastiglione Feb 22, 2024
6fb8fc2
Fix cmake typo
kastiglione Feb 22, 2024
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
10 changes: 9 additions & 1 deletion stdlib/public/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,16 @@ list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "Freestand
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "Extern")
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "BitwiseCopyable")

if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")
set(swift_bin_dir "${CMAKE_BINARY_DIR}/bin")
set(swift_lib_dir "${CMAKE_BINARY_DIR}/lib")
else()
set(swift_bin_dir "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}")
set(swift_lib_dir "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib")
endif()

list(APPEND swift_stdlib_compile_flags "-external-plugin-path"
"${CMAKE_BINARY_DIR}/lib/swift/host/plugins#${CMAKE_BINARY_DIR}/bin/swift-plugin-server")
"${swift_lib_dir}/swift/host/plugins#${swift_bin_dir}/swift-plugin-server")
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "SymbolLinkageMarkers")

set(swift_core_incorporate_object_libraries)
Expand Down