From 162fcbc87e6820502c2bff42a4a1fc08567319db Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 31 May 2017 10:01:14 +0000 Subject: Revert "Driver: Don't mix system tools with devtoolset tools on RHEL" This reverts commit r304293. This was comitted accidentally. llvm-svn: 304296 --- clang/lib/Driver/ToolChains.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index a06a8a5..9bc9ae4 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/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"); -- cgit v1.1