Commit 476b6541 authored by Tom Stellard's avatar Tom Stellard
Browse files

Driver: Don't mix system tools with devtoolset tools on RHEL

For example, we don't want to mix a devtoolset gcc with system ld, because
they don't always work together.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@304293 91177308-0d34-0410-b5e6-96231b3b80d8
parent 9b5539e2
......@@ -4111,6 +4111,15 @@ 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