From b9cfd99a263393875ef30c88a6389df363e2b8af Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Mon, 27 Apr 2020 14:54:36 +0000 Subject: [PATCH] [Windows] Don't prepend lib prefix for static library --- lib/Driver/Driver.cpp | 2 +- test/Driver/static-archive.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index e77f03e9fbb2e..9a6543c3a9f73 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -2414,7 +2414,7 @@ static StringRef baseNameForImage(const JobAction *JA, const OutputInfo &OI, return llvm::sys::path::stem(BaseInput); if (isa(JA)) { - Buffer = "lib"; + Buffer = Triple.isOSWindows() ? "" : "lib"; Buffer.append(BaseName); Buffer.append(Triple.isOSWindows() ? ".lib" : ".a"); return Buffer.str(); diff --git a/test/Driver/static-archive.swift b/test/Driver/static-archive.swift index f2b7dbfc3d1c8..780da8eaa4686 100644 --- a/test/Driver/static-archive.swift +++ b/test/Driver/static-archive.swift @@ -42,7 +42,7 @@ // INFERRED_NAME_DARWIN: -o libARCHIVER.a // INFERRED_NAME_LINUX: libARCHIVER.a // INFERRED_NAME_WINDOWS: -lib -// INFERRED_NAME_WINDOWS: libARCHIVER.lib +// INFERRED_NAME_WINDOWS: ARCHIVER.lib // RUN: not %swiftc_driver -driver-print-jobs -module-name ARCHIVER %s -emit-executable -static 2>&1 | %FileCheck -check-prefix ERROR %s