From 3c8961bedc65c9a15cbe67a2ef385a0938f7cfef Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 31 May 2017 10:01:14 +0000
Subject: [PATCH] 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
---
lib/Driver/ToolChains.cpp | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index a06a8a58633..9bc9ae4f6a5 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");
--
GitLab