[llvm-branch-commits] [cfe-branch] r228059 - Merging r227979:

[Hans Wennborg]

Author: hans
Date: Tue Feb  3 16:57:34 2015
New Revision: 228059

URL: http://llvm.org/viewvc/llvm-project?rev=228059&view=rev
Log:
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!
------------------------------------------------------------------------

Modified:
    cfe/branches/release_36/   (props changed)
    cfe/branches/release_36/lib/Driver/Tools.cpp

Propchange: cfe/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  3 16:57:34 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:226008,226049,226136,226282,226382,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368,227393
+/cfe/trunk:226008,226049,226136,226282,226382,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368,227393,227979
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_36/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/lib/Driver/Tools.cpp?rev=228059&r1=228058&r2=228059&view=diff
==============================================================================
--- cfe/branches/release_36/lib/Driver/Tools.cpp (original)
+++ cfe/branches/release_36/lib/Driver/Tools.cpp Tue Feb  3 16:57:34 2015
@@ -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 ToolChai
   // 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