diff options
author | Dan Albert <danalbert@google.com> | 2017-08-15 00:31:44 +0000 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2017-08-15 00:31:44 +0000 |
commit | 1e29ee9d9551bee4c796fb092e2ac4b340dc89ca (patch) | |
tree | 0fa43ab88cba2c14bb9ea6d68ea5fe9b79f2e813 /clang/lib/Driver/ToolChains/CommonArgs.cpp | |
parent | 3450d7e7f70da51e1ec6ab2d8862697c4c2908e2 (diff) | |
download | bcm5719-llvm-1e29ee9d9551bee4c796fb092e2ac4b340dc89ca.tar.gz bcm5719-llvm-1e29ee9d9551bee4c796fb092e2ac4b340dc89ca.zip |
Revert "Fix LLVMgold plugin name/path for non-Linux."
Broke a test. Will fix the test and re-land later.
llvm-svn: 310903
Diffstat (limited to 'clang/lib/Driver/ToolChains/CommonArgs.cpp')
-rw-r--r-- | clang/lib/Driver/ToolChains/CommonArgs.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index b9b5b2cbe6e..1273b7aabc0 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/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 |