diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-02-03 22:57:34 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-02-03 22:57:34 +0000 |
| commit | 52f839a502adf68b606bf81476912120ea71b13b (patch) | |
| tree | 4abfd216e028bf44c5234056f2c49d1eb007edef | |
| parent | 384d518d9a6fc04cebc4e03d0cb0d352c3bebb9b (diff) | |
Merging r227979:
------------------------------------------------------------------------
r227979 | rafael | 2015-02-03 08:33:53 -0800 (Tue, 03 Feb 2015) | 3 lines
Use CLANG_LIBDIR_SUFFIX when looking for the gold plugin.
Patch by ?\196?\176smail D?\195?\182nmez!
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_36@228059 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/Tools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 28c46f636e..75eef9ecdf 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -13,6 +13,7 @@ #include "clang/Basic/LangOptions.h" #include "clang/Basic/ObjCRuntime.h" #include "clang/Basic/Version.h" +#include "clang/Config/config.h" #include "clang/Driver/Action.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" @@ -1538,7 +1539,7 @@ static void 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"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; + 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 |