Skip to content

Commit 9076ab2

Browse files
committed
Fix swiftrtPath
1 parent 9fcd3f2 commit 9076ab2

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Sources/SwiftDriver/Jobs/WindowsToolchain+LinkerSupport.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ extension WindowsToolchain {
9393
isShared: hasRuntimeArgs
9494
)
9595

96-
if hasRuntimeArgs && targetTriple.environment != .android {
96+
if hasRuntimeArgs {
9797
// FIXME: We probably shouldn't be adding an rpath here unless we know
9898
// ahead of time the standard library won't be copied.
9999
for path in runtimePaths {
@@ -110,10 +110,9 @@ extension WindowsToolchain {
110110
isShared: true
111111
)
112112

113-
let swiftrtPath = sharedResourceDirPath
114-
.appending(
115-
components: "x86_64", "swiftrt.o"
116-
)
113+
let swiftrtPath = sharedResourceDirPath.appending(
114+
components: "windows", targetTriple.archName, "swiftrt.obj"
115+
)
117116
commandLine.appendPath(swiftrtPath)
118117

119118
let inputFiles: [Job.ArgTemplate] = inputs.compactMap { input in

0 commit comments

Comments
 (0)