Merge pull request #10381 from keith/ks/no-linking-rpath

Don't add rpath to swift with statically linking.

Author: jrose-apple

lib/Driver/ToolChains.cpp

@@ -1267,6 +1267,10 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job,
     Arguments.push_back("-force_load_swift_libs");
   } else {
     Arguments.push_back(context.Args.MakeArgString(RuntimeLibPath));
+    // FIXME: We probably shouldn't be adding an rpath here unless we know ahead
+    // of time the standard library won't be copied. SR-1967
+    Arguments.push_back("-rpath");
+    Arguments.push_back(context.Args.MakeArgString(RuntimeLibPath));
   }
 
   if (context.Args.hasArg(options::OPT_profile_generate)) {
@@ -1305,11 +1309,6 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job,
     Arguments.push_back(context.Args.MakeArgString(LibProfile));
   }
 
-  // FIXME: We probably shouldn't be adding an rpath here unless we know ahead
-  // of time the standard library won't be copied.
-  Arguments.push_back("-rpath");
-  Arguments.push_back(context.Args.MakeArgString(RuntimeLibPath));
-
   // FIXME: Properly handle deployment targets.
   assert(Triple.isiOS() || Triple.isWatchOS() || Triple.isMacOSX());
   if (Triple.isiOS()) {

test/Driver/linker.swift

@@ -2,6 +2,9 @@
 // RUN: %FileCheck %s < %t.simple.txt
 // RUN: %FileCheck -check-prefix SIMPLE %s < %t.simple.txt
 
+// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -static-stdlib %s 2>&1 > %t.simple.txt
+// RUN: %FileCheck -check-prefix SIMPLE_STATIC -implicit-check-not -rpath %s < %t.simple.txt
+
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios7.1 %s 2>&1 > %t.simple.txt
 // RUN: %FileCheck -check-prefix IOS_SIMPLE %s < %t.simple.txt
 
@@ -69,6 +72,23 @@
 // SIMPLE: -o linker
 
 
+// SIMPLE_STATIC: swift
+// SIMPLE_STATIC: -o [[OBJECTFILE:.*]]
+
+// SIMPLE_STATIC-NEXT: bin/ld{{"? }}
+// SIMPLE_STATIC: [[OBJECTFILE]]
+// SIMPLE_STATIC: -lobjc
+// SIMPLE_STATIC: -lSystem
+// SIMPLE_STATIC: -arch x86_64
+// SIMPLE_STATIC: -L [[STDLIB_PATH:[^ ]+/lib/swift_static/macosx]]
+// SIMPLE_STATIC: -lc++
+// SIMPLE_STATIC: -framework Foundation
+// SIMPLE_STATIC: -force_load_swift_libs
+// SIMPLE_STATIC: -macosx_version_min 10.{{[0-9]+}}.{{[0-9]+}}
+// SIMPLE_STATIC: -no_objc_category_merging
+// SIMPLE_STATIC: -o linker
+
+
 // IOS_SIMPLE: swift
 // IOS_SIMPLE: -o [[OBJECTFILE:.*]]