Merge pull request #680 from ahoppen/ahoppen/no-toolchain-rpath

Don’t include the toolchain rpath when installing swift-format

Author: ahoppen

Package.swift

@@ -14,6 +14,24 @@
 import Foundation
 import PackageDescription
 
+// MARK: - Parse build arguments
+
+func hasEnvironmentVariable(_ name: String) -> Bool {
+  return ProcessInfo.processInfo.environment[name] != nil
+}
+
+// When building the toolchain on the CI, don't add the CI's runpath for the
+// final build before installing.
+let installAction = hasEnvironmentVariable("SOURCEKIT_LSP_CI_INSTALL")
+
+
+// MARK: - Compute custom build settings
+
+var swiftformatLinkSettings: [LinkerSetting] = []
+if installAction {
+  swiftformatLinkSettings += [.unsafeFlags(["-no-toolchain-stdlib-rpath"], .when(platforms: [.linux, .android]))]
+}
+
 let package = Package(
   name: "swift-format",
   platforms: [
@@ -106,7 +124,8 @@ let package = Package(
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftParser", package: "swift-syntax"),
-      ]
+      ],
+      linkerSettings: swiftformatLinkSettings
     ),
 
     .testTarget(

build-script-helper.py

@@ -147,9 +147,11 @@ def get_swiftpm_options(
     return args
 
 
-def get_swiftpm_environment_variables():
+def get_swiftpm_environment_variables(action: str):
     env = dict(os.environ)
     env["SWIFTCI_USE_LOCAL_DEPS"] = "1"
+    if action == "install":
+        env["SOURCEKIT_LSP_CI_INSTALL"] = "1"
     return env
 
 
@@ -194,7 +196,7 @@ def invoke_swiftpm(
 
 def build(args: argparse.Namespace) -> None:
     print("** Building swift-format **")
-    env = get_swiftpm_environment_variables()
+    env = get_swiftpm_environment_variables(args.action)
     invoke_swiftpm(
         package_path=args.package_path,
         swift_exec=args.swift_exec,
@@ -212,7 +214,7 @@ def build(args: argparse.Namespace) -> None:
 
 def test(args: argparse.Namespace) -> None:
     print("** Testing swift-format **")
-    env = get_swiftpm_environment_variables()
+    env = get_swiftpm_environment_variables(args.action)
     invoke_swiftpm(
         package_path=args.package_path,
         swift_exec=args.swift_exec,
@@ -233,7 +235,7 @@ def install(args: argparse.Namespace) -> None:
 
     print("** Installing swift-format **")
 
-    env = get_swiftpm_environment_variables()
+    env = get_swiftpm_environment_variables(args.action)
     swiftpm_args = get_swiftpm_options(
         swift_exec=args.swift_exec,
         package_path=args.package_path,