Skip to content

Commit 3c8961b

Browse files
committed
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
1 parent c6e339a commit 3c8961b

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

lib/Driver/ToolChains.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4112,15 +4112,6 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
41124112

41134113
Distro Distro(D.getVFS());
41144114

4115-
if (Distro.IsRedhat()) {
4116-
// On RHEL, we want to add a bin directory that is relative to the detected
4117-
// gcc install, because if we are using devtoolset gcc then we want to
4118-
// use other tools from devtoolset (e.g. ld) instead of the standard system
4119-
// tools.
4120-
PPaths.push_back(Twine(GCCInstallation.getParentLibPath() +
4121-
"/../bin").str());
4122-
}
4123-
41244115
if (Distro.IsOpenSUSE() || Distro.IsUbuntu()) {
41254116
ExtraOpts.push_back("-z");
41264117
ExtraOpts.push_back("relro");

0 commit comments

Comments
 (0)