diff options
author | Tom Stellard <tstellar@redhat.com> | 2017-05-31 10:01:14 +0000 |
---|---|---|
committer | Tom Stellard <tstellar@redhat.com> | 2017-05-31 10:01:14 +0000 |
commit | 3c8961bedc65c9a15cbe67a2ef385a0938f7cfef (patch) | |
tree | 35b6b18e04de126683ba7212bf041745c1a464c3 /lib | |
parent | c6e339a400e46d4784433114aa45a70ea159fc22 (diff) |
Revert "Driver: Don't mix system tools with devtoolset tools on RHEL"upstream/release_40
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
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Driver/ToolChains.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
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"); |