Skip to content

Commit 9fb3a48

Browse files
authored
Merge pull request #8189 from norio-nomura/package-sourcekit-inproc-on-linux
[Preset] include sourcekit-inproc in default install on Linux
2 parents 0ecf8a9 + a93bddf commit 9fb3a48

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

tools/SourceKit/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,13 @@ macro(add_sourcekit_library name)
197197
endif()
198198
endif()
199199

200+
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
201+
if(SOURCEKITLIB_SHARED)
202+
set_target_properties(${name} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
203+
set_target_properties(${name} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib/swift/linux:/usr/lib/swift/linux")
204+
endif()
205+
endif()
206+
200207
if("${SOURCEKITLIB_INSTALL_IN_COMPONENT}" STREQUAL "")
201208
if(SOURCEKITLIB_SHARED)
202209
set(SOURCEKITLIB_INSTALL_IN_COMPONENT tools)

utils/build-presets.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ install-llbuild
708708
install-swiftpm
709709
install-xctest
710710
install-prefix=/usr
711-
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
711+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
712712
build-swift-static-stdlib
713713
build-swift-static-sdk-overlay
714714
build-swift-stdlib-unittest-extra

0 commit comments

Comments
 (0)