Merge pull request #29399 from compnerd/sk-rpath

build: move the RPATH handling to the executables

Author: compnerd

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

@@ -240,17 +240,6 @@ macro(add_sourcekit_executable name)
   target_link_libraries(${name} PRIVATE ${LLVM_COMMON_LIBS})
 
   set_target_properties(${name} PROPERTIES FOLDER "SourceKit executables")
-  if (NOT SWIFT_ASAN_BUILD)
-    if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-      set_target_properties(${name}
-        PROPERTIES
-        LINK_FLAGS "-Wl,-exported_symbol,_main")
-    endif()
-    if(SWIFT_ANALYZE_CODE_COVERAGE)
-      set_property(TARGET "${name}" APPEND_STRING PROPERTY
-        LINK_FLAGS " -fprofile-instr-generate -fcoverage-mapping")
-    endif()
-  endif()
   add_sourcekit_default_compiler_flags("${name}")
 endmacro()
 

tools/SourceKit/tools/complete-test/CMakeLists.txt

@@ -13,19 +13,17 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
     BlocksRuntime)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set_target_properties(complete-test
-    PROPERTIES
-    LINK_FLAGS "-Wl,-rpath -Wl,@executable_path/../lib")
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  set_target_properties(complete-test PROPERTIES
+    INSTALL_RPATH "@executable_path/../lib")
+  target_link_options(complete-test PRIVATE
+    "LINKER:-exported_symbol,_main")
 endif()
-
 if(SWIFT_ANALYZE_CODE_COVERAGE)
   set_property(TARGET complete-test APPEND_STRING PROPERTY
     LINK_FLAGS " -fprofile-instr-generate -fcoverage-mapping")
 endif()
 
 add_dependencies(tools complete-test)
 swift_install_in_component(TARGETS complete-test
-                           RUNTIME
-                             DESTINATION bin
-                             COMPONENT tools)
+  RUNTIME DESTINATION bin COMPONENT tools)

tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

@@ -15,10 +15,11 @@ endif()
 target_link_libraries(sourcekitd-repl PRIVATE
   libedit)
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set_target_properties(sourcekitd-repl
-    PROPERTIES
-    LINK_FLAGS "-Wl,-rpath -Wl,@executable_path/../lib")
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  set_target_properties(sourcekitd-repl PROPERTIES
+    INSTALL_RPATH "@executable_path/../lib")
+  target_link_options(sourcekitd-repl PRIVATE
+    "LINKER:-exported_symbol,_main")
 endif()
 if(SWIFT_ANALYZE_CODE_COVERAGE)
   set_property(TARGET sourcekitd-repl APPEND_STRING PROPERTY
@@ -27,6 +28,4 @@ endif()
 
 add_dependencies(tools sourcekitd-repl)
 swift_install_in_component(TARGETS sourcekitd-repl
-                           RUNTIME
-                             DESTINATION bin
-                             COMPONENT tools)
+  RUNTIME DESTINATION bin COMPONENT tools)

tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

@@ -25,19 +25,17 @@ endif()
 
 add_dependencies(sourcekitd-test sourcekitdTestOptionsTableGen)
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set_target_properties(sourcekitd-test
-    PROPERTIES
-    LINK_FLAGS "-Wl,-rpath -Wl,@executable_path/../lib")
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+  set_target_properties(sourcekitd-test PROPERTIES
+    INSTALL_RPATH "@executable_path/../lib")
+  target_link_options(sourcekitd-test PRIVATE
+    "LINKER:-exported_symbol,_main")
 endif()
-
 if(SWIFT_ANALYZE_CODE_COVERAGE)
   set_property(TARGET sourcekitd-test APPEND_STRING PROPERTY
     LINK_FLAGS " -fprofile-instr-generate -fcoverage-mapping")
 endif()
 
 add_dependencies(tools sourcekitd-test)
 swift_install_in_component(TARGETS sourcekitd-test
-                           RUNTIME
-                             DESTINATION bin
-                             COMPONENT tools)
+  RUNTIME DESTINATION bin COMPONENT tools)