Fix swiftrtPath

stevapple · stevapple · commit 3e0873705f7f · 2020-09-14T00:56:48.000+08:00
diff --git a/Sources/SwiftDriver/Jobs/WindowsToolchain+LinkerSupport.swift b/Sources/SwiftDriver/Jobs/WindowsToolchain+LinkerSupport.swift
@@ -93,7 +93,7 @@ extension WindowsToolchain {
           isShared: hasRuntimeArgs
         )
 
-        if hasRuntimeArgs && targetTriple.environment != .android {
+        if hasRuntimeArgs {
           // 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 {
@@ -112,7 +112,7 @@ extension WindowsToolchain {
 
         let swiftrtPath = sharedResourceDirPath
           .appending(
-            components: "x86_64", "swiftrt.o"
+            components: "windows", targetTriple.archName , "swiftrt.obj"
           )
         commandLine.appendPath(swiftrtPath)
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ extension WindowsToolchain {`
`93`	`93`	`isShared: hasRuntimeArgs`
`94`	`94`	`)`
`95`	`95`
`96`		`- if hasRuntimeArgs && targetTriple.environment != .android {`
	`96`	`+ if hasRuntimeArgs {`
`97`	`97`	`// FIXME: We probably shouldn't be adding an rpath here unless we know`
`98`	`98`	`// ahead of time the standard library won't be copied.`
`99`	`99`	`for path in runtimePaths {`
`@@ -112,7 +112,7 @@ extension WindowsToolchain {`
`112`	`112`
`113`	`113`	`let swiftrtPath = sharedResourceDirPath`
`114`	`114`	`.appending(`
`115`		`- components: "x86_64", "swiftrt.o"`
	`115`	`+ components: "windows", targetTriple.archName , "swiftrt.obj"`
`116`	`116`	`)`
`117`	`117`	`commandLine.appendPath(swiftrtPath)`
`118`	`118`