Merge pull request #25902 from compnerd/sdk-on-non-darwin

swift-ci · web-flow · commit 930699cb8b88 · 2019-07-03T10:35:25.000-07:00
diff --git a/lib/Frontend/CompilerInvocation.cpp b/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/test/Driver/Inputs/android.sdk/usr/lib/swift/android/x86_64/Swift.swiftinterface b/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/test/Driver/android-sdk.swift b/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`