From fb6fc9cb3e2f69414947bfb2fc0aafee80e50169 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 14 Jan 2024 13:17:50 +0000 Subject: [PATCH] Prefer `llvm-ar` over `ar` on WebAssembly Static "ar"chivers not prefixed with "llvm-" rarely support WebAssembly object file formats, and the legacy driver uses "llvm-ar", so it would be better to keep the consistency. --- Sources/SwiftDriver/Toolchains/WebAssemblyToolchain.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Sources/SwiftDriver/Toolchains/WebAssemblyToolchain.swift b/Sources/SwiftDriver/Toolchains/WebAssemblyToolchain.swift index 662faf574..25cdb90c0 100644 --- a/Sources/SwiftDriver/Toolchains/WebAssemblyToolchain.swift +++ b/Sources/SwiftDriver/Toolchains/WebAssemblyToolchain.swift @@ -95,10 +95,7 @@ public final class WebAssemblyToolchain: Toolchain { switch tool { case .swiftCompiler: return try lookup(executable: "swift-frontend") - case .staticLinker(nil): - return try lookup(executable: "ar") - case .staticLinker(.llvmFull), - .staticLinker(.llvmThin): + case .staticLinker: return try lookup(executable: "llvm-ar") case .dynamicLinker: // FIXME: This needs to look in the tools_directory first.