Skip to content

Commit 038b58d

Browse files
committed
speculative fixes
1 parent b0ec4b1 commit 038b58d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/CompilerSwiftSyntax/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ macro(target_link_libraries_whole_archive target)
4949

5050
file(GENERATE
5151
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/link_files.txt
52-
CONTENT "'$<JOIN:${link_files},'\n'>'")
52+
CONTENT "$<JOIN:${link_files},\n>")
5353
target_link_options(${target} PRIVATE "@${CMAKE_CURRENT_BINARY_DIR}/link_files.txt")
5454
endmacro()
5555

tools/libSwiftScan/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ if(SWIFT_BUILD_SWIFT_SYNTAX)
5252
APPEND PROPERTY INSTALL_RPATH "@loader_path/swift/host/compiler")
5353
set_property(
5454
TARGET libSwiftScan
55-
APPEND PROPERTY INSTALL_RPATH "@loader_path/compiler")
55+
APPEND PROPERTY INSTALL_RPATH "@loader_path/../host/compiler")
5656
elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
5757
set_property(
5858
TARGET libSwiftScan
5959
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/swift/host/compiler")
6060
set_property(
6161
TARGET libSwiftScan
62-
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/compiler")
62+
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../host/compiler")
6363
endif()
6464
endif()
6565

0 commit comments

Comments
 (0)