[llvm-branch-commits] [cfe-branch] r304296 - Revert "Driver: Don't mix system tools with devtoolset tools on RHEL"

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed May 31 05:01:14 2017
New Revision: 304296

URL: http://llvm.org/viewvc/llvm-project?rev=304296&view=rev
Log:
Revert "Driver: Don't mix system tools with devtoolset tools on RHEL"

This reverts commit r304293.

This was comitted accidentally.

Modified:
    cfe/branches/release_40/lib/Driver/ToolChains.cpp

Modified: cfe/branches/release_40/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/Driver/ToolChains.cpp?rev=304296&r1=304295&r2=304296&view=diff
==============================================================================
--- cfe/branches/release_40/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_40/lib/Driver/ToolChains.cpp Wed May 31 05:01:14 2017
@@ -4112,15 +4112,6 @@ Linux::Linux(const Driver &D, const llvm
 
   Distro Distro(D.getVFS());
 
-  if (Distro.IsRedhat()) {
-    // On RHEL, we want to add a bin directory that is relative to the detected
-    // gcc install, because if we are using devtoolset gcc then we want to
-    // use other tools from devtoolset (e.g. ld) instead of the standard system
-    // tools.
-    PPaths.push_back(Twine(GCCInstallation.getParentLibPath() +
-                     "/../bin").str());
-  }
-
   if (Distro.IsOpenSUSE() || Distro.IsUbuntu()) {
     ExtraOpts.push_back("-z");
     ExtraOpts.push_back("relro");