From fea7a1940941fce10a7e30508fced96542d23c46 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 15 Aug 2017 23:57:34 +0000 Subject: Revert "Revert "Revert "Fix LLVMgold plugin name/path for non-Linux.""" git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@310977 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains/CommonArgs.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'lib/Driver/ToolChains/CommonArgs.cpp') diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp index b9b5b2cbe6..1273b7aabc 100644 --- a/lib/Driver/ToolChains/CommonArgs.cpp +++ b/lib/Driver/ToolChains/CommonArgs.cpp @@ -376,20 +376,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, // as gold requires -plugin to come before any -plugin-opt that -Wl might // forward. CmdArgs.push_back("-plugin"); - -#if defined(LLVM_ON_WIN32) - const char *Suffix = ".dll"; -#elif defined(__APPLE__) - const char *Suffix = ".dylib"; -#else - const char *Suffix = ".so"; -#endif - - SmallString<1024> Plugin; - llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) + - "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + - Suffix, - Plugin); + std::string Plugin = + ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so"; CmdArgs.push_back(Args.MakeArgString(Plugin)); // Try to pass driver level flags relevant to LTO code generation down to -- cgit v1.2.3