Merge pull request #832 from swiftlang/jgrynspan/fix-rpaths-6.0

[6.0] Update install to ensure the build directory is not added to the rpath
swiftlang · Nov 22, 2024 · 18c42c1 · 18c42c1
2 parents 7efdd76 + a9d4675
commit 18c42c1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/cmake/modules/SwiftModuleInstallation.cmake b/cmake/modules/SwiftModuleInstallation.cmake
@@ -32,12 +32,14 @@ function(_swift_testing_install_target module)
 
   if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(lib_destination_dir "lib/${swift}/${swift_os}/testing")
-    set_property(TARGET ${module} PROPERTY
-      INSTALL_RPATH "@loader_path/..")
+    set_target_properties(${module} PROPERTIES
+      INSTALL_RPATH "@loader_path/.."
+      INSTALL_REMOVE_ENVIRONMENT_RPATH ON)
   else()
     set(lib_destination_dir "lib/${swift}/${swift_os}")
-    set_property(TARGET ${module} PROPERTY
-      INSTALL_RPATH "$ORIGIN")
+    set_target_properties(${module} PROPERTIES
+      INSTALL_RPATH "$ORIGIN"
+      INSTALL_REMOVE_ENVIRONMENT_RPATH ON)
   endif()
 
   install(TARGETS ${module}