From c787e4eb1ec1ea8b9c8ce8facdb7c497a9e277e9 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 30 Dec 2014 18:55:37 +0000 Subject: Driver: use the canonical library prefix on Windows Unlike Unices, Windows does not use a library prefix. Use the traditional naming scheme even for Windows itanium environments. This makes the builtins behave more like the sanitisers as well. llvm-svn: 224996 --- clang/lib/Driver/Tools.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'clang/lib') diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 6ee9a9204cc..25dbc410575 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2128,11 +2128,12 @@ static void addClangRT(const ToolChain &TC, const ArgList &Args, ArgStringList &CmdArgs) { bool IsOSWindows = TC.getTriple().isOSWindows(); StringRef Arch = getArchNameForCompilerRTLib(TC); + const char *Prefix = IsOSWindows ? "" : "lib"; const char *Suffix = IsOSWindows ? ".lib" : ".a"; SmallString<128> LibClangRT = getCompilerRTLibDir(TC); llvm::sys::path::append(LibClangRT, - Twine("libclang_rt.builtins-") + Arch + Suffix); + Prefix + Twine("clang_rt.builtins-") + Arch + Suffix); CmdArgs.push_back(Args.MakeArgString(LibClangRT)); if (!IsOSWindows) { -- cgit v1.2.3