Commit 3c8961be authored by Tom Stellard's avatar Tom Stellard
Browse files

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
parent c6e339a4
......@@ -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");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment