Skip to content

Commit 2841a26

Browse files
authored
Revert "[Debugging] Use SWIFT_NATIVE_SWIFT_TOOLS_PATH if defined (#71814)"
This reverts commit 557628c.
1 parent e2c94ad commit 2841a26

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

stdlib/public/core/CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -315,16 +315,8 @@ list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "Freestand
315315
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "Extern")
316316
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "BitwiseCopyable")
317317

318-
if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")
319-
set(swift_bin_dir "${CMAKE_BINARY_DIR}/bin")
320-
set(swift_lib_dir "${CMAKE_BINARY_DIR}/lib")
321-
else()
322-
set(swift_bin_dir "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}")
323-
set(swift_lib_dir "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib")
324-
endif()
325-
326318
list(APPEND swift_stdlib_compile_flags "-external-plugin-path"
327-
"${swift_lib_dir}/swift/host/plugins#${swift_bin_dir}/swift-plugin-server")
319+
"${CMAKE_BINARY_DIR}/lib/swift/host/plugins#${CMAKE_BINARY_DIR}/bin/swift-plugin-server")
328320
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "SymbolLinkageMarkers")
329321

330322
set(swift_core_incorporate_object_libraries)

0 commit comments

Comments
 (0)