Merge pull request #732 from buttaface/rpath

Enable checking for -no-toolchain-stdlib-rpath and use it on this repo's binaries before installing

Author: artemcm

Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

@@ -128,6 +128,10 @@ extension GenericUnixToolchain {
       let staticExecutable = parsedOptions.hasFlag(positive: .staticExecutable,
                                                    negative: .noStaticExecutable,
                                                   default: false)
+      let toolchainStdlibRpath = parsedOptions
+                                 .hasFlag(positive: .toolchainStdlibRpath,
+                                          negative: .noToolchainStdlibRpath,
+                                          default: true)
       let hasRuntimeArgs = !(staticStdlib || staticExecutable)
 
       let runtimePaths = try runtimeLibraryPaths(
@@ -137,7 +141,8 @@ extension GenericUnixToolchain {
         isShared: hasRuntimeArgs
       )
 
-      if hasRuntimeArgs && targetTriple.environment != .android {
+      if hasRuntimeArgs && targetTriple.environment != .android &&
+          toolchainStdlibRpath {
         // FIXME: We probably shouldn't be adding an rpath here unless we know
         //        ahead of time the standard library won't be copied.
         for path in runtimePaths {

Utilities/build-script-helper.py

@@ -109,6 +109,9 @@ def get_swiftpm_options(args):
         '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/linux',
       ]
 
+  if args.action == 'install':
+    swiftpm_args += ['-Xswiftc', '-no-toolchain-stdlib-rpath']
+
   return swiftpm_args
 
 def install_binary(file, source_dir, install_dir, verbose):