commit 5671b890eacb0e90cf4be35005fc1b7bdeaeb703
author Dan Albert <danalbert@google.com> Tue Aug 15 23:57:34 2017 +0000
committer Dan Albert <danalbert@google.com> Tue Aug 15 23:57:34 2017 +0000
tree dd943fe1a2ac55964abaea8161b94c2533654a58
parent 8afdd2f81e575e030e9478e08417753f3bf92b4e

Revert "Revert "Revert "Fix LLVMgold plugin name/path for non-Linux."""

llvm-svn: 310977

clang/lib/Driver/ToolChains/CommonArgs.cpp

diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index b9b5b2c..1273b7a 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -376,20 +376,8 @@
   // 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