From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 31 May 2017 10:01:14 +0000 (+0000)
Subject: Revert "Driver: Don't mix system tools with devtoolset tools on RHEL"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fheads%2Frelease_40;p=clang

Revert "Driver: Don't mix system tools with devtoolset tools on RHEL"

This reverts commit r304293.

This was comitted accidentally.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@304296 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index a06a8a5863..9bc9ae4f6a 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -4112,15 +4112,6 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
 
   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");