Use CLANG_LIBDIR_SUFFIX when looking for the gold plugin.
authorRafael Espindola <rafael.espindola@gmail.com>
Tue, 3 Feb 2015 16:33:53 +0000 (16:33 +0000)
committerRafael Espindola <rafael.espindola@gmail.com>
Tue, 3 Feb 2015 16:33:53 +0000 (16:33 +0000)
Patch by İsmail Dönmez!

llvm-svn: 227979

clang/lib/Driver/Tools.cpp

index 9c89c52..9dd5a90 100644 (file)
@@ -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"
@@ -1531,7 +1532,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