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 a06a8a5..9bc9ae4 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -4112,15 +4112,6 @@
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");
