Skip to content

Commit 86b7bac

Browse files
authored
Merge pull request #34023 from buttaface/rpath
[linux] remove absolute rpath of /usr/lib/swift/linux added to many shared libraries
2 parents c4a615e + 69d04aa commit 86b7bac

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ function(add_swift_host_library name)
471471
INSTALL_NAME_DIR "@rpath")
472472
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)
473473
set_target_properties(${name} PROPERTIES
474-
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/linux")
474+
INSTALL_RPATH "$ORIGIN")
475475
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN)
476476
set_target_properties(${name} PROPERTIES
477477
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin")

stdlib/cmake/modules/AddSwiftStdlib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ function(_add_swift_target_library_single target name)
998998
elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "LINUX")
999999
set_target_properties("${target}"
10001000
PROPERTIES
1001-
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/linux")
1001+
INSTALL_RPATH "$ORIGIN")
10021002
elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "CYGWIN")
10031003
set_target_properties("${target}"
10041004
PROPERTIES

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ macro(add_sourcekit_library name)
9999
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
100100
if(SOURCEKITLIB_SHARED)
101101
set_target_properties(${name} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
102-
set_target_properties(${name} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib/swift/linux:/usr/lib/swift/linux")
102+
set_target_properties(${name} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib/swift/linux")
103103
endif()
104104
endif()
105105

0 commit comments

Comments
 (0)