---

swift-ci · swift-ci · commit 8f4fcd5b49e5 · 2019-07-03T10:50:04.000-07:00
yaml --- r: 323483 b: refs/heads/tensorflow-next c: 0137dbe h: refs/heads/master i: 323481: 09e8b91 323479: 858b5a6
diff --git a/[refs] b/[refs]
@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: b1dcb83b3d586ffa107e2ca7ce4d0e671a2b6c2c
+refs/heads/tensorflow-next: 0137dbe19c859cc1bafcb091925c4f7cbe015f11
diff --git a/branches/tensorflow-next/lib/Frontend/CompilerInvocation.cpp b/branches/tensorflow-next/lib/Frontend/CompilerInvocation.cpp
@@ -89,6 +89,10 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts,
   if (!SearchPathOpts.SDKPath.empty()) {
     LibPath = SearchPathOpts.SDKPath;
     llvm::sys::path::append(LibPath, "usr", "lib", "swift");
+    if (!Triple.isOSDarwin()) {
+      llvm::sys::path::append(LibPath, getPlatformNameForTriple(Triple));
+      llvm::sys::path::append(LibPath, swift::getMajorArchitectureName(Triple));
+    }
     SearchPathOpts.RuntimeLibraryImportPaths.push_back(LibPath.str());
   }
 }
diff --git a/branches/tensorflow-next/test/Driver/Inputs/android.sdk/usr/lib/swift/android/x86_64/Swift.swiftinterface b/branches/tensorflow-next/test/Driver/Inputs/android.sdk/usr/lib/swift/android/x86_64/Swift.swiftinterface
@@ -0,0 +1,3 @@
+// swift-interface-format-version: 1.0
+// swift-module-flags: -target x86_64-unknown-linux-android -disable-objc-interop -swift-version 5 -O -module-name Swift -parse-stdlib
+
diff --git a/branches/tensorflow-next/test/Driver/android-sdk.swift b/branches/tensorflow-next/test/Driver/android-sdk.swift
@@ -0,0 +1 @@
+// RUN: %swift -target x86_64-unknown-linux-android -sdk %S/Inputs/android.sdk %s -typecheck

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,10 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts,`
`89`	`89`	`if (!SearchPathOpts.SDKPath.empty()) {`
`90`	`90`	`LibPath = SearchPathOpts.SDKPath;`
`91`	`91`	`llvm::sys::path::append(LibPath, "usr", "lib", "swift");`
	`92`	`+ if (!Triple.isOSDarwin()) {`
	`93`	`+ llvm::sys::path::append(LibPath, getPlatformNameForTriple(Triple));`
	`94`	`+ llvm::sys::path::append(LibPath, swift::getMajorArchitectureName(Triple));`
	`95`	`+ }`
`92`	`96`	`SearchPathOpts.RuntimeLibraryImportPaths.push_back(LibPath.str());`
`93`	`97`	`}`
`94`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// swift-interface-format-version: 1.0`
	`2`	`+// swift-module-flags: -target x86_64-unknown-linux-android -disable-objc-interop -swift-version 5 -O -module-name Swift -parse-stdlib`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+// RUN: %swift -target x86_64-unknown-linux-android -sdk %S/Inputs/android.sdk %s -typecheck`