This is an archive of the discontinued LLVM Phabricator instance.

Differential D77420

Also look for devtoolset-9 gcc toolchain
ClosedPublic

Authored by stephan.dollberg on Apr 3 2020, 11:11 AM.

Details

Reviewers
chandlerc
aganea
bkramer
Commits
rG7b9c6c16c33d: Also look for devtoolset-9 gcc toolchain
Summary

devtoolset-9 has been out for a while so also look for it.

Diff Detail

Event Timeline

stephan.dollberg created this revision.Apr 3 2020, 11:11 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 3 2020, 11:11 AM
stephan.dollberg added reviewers: aganea, bkramer.Apr 15 2020, 3:10 PM
bkramer accepted this revision.Apr 15 2020, 4:01 PM

looks good

This revision is now accepted and ready to land.Apr 15 2020, 4:01 PM
stephan.dollberg added a comment.Apr 15 2020, 4:28 PM

Thanks, can you merge it? Don't have access.

Closed by commit rG7b9c6c16c33d: Also look for devtoolset-9 gcc toolchain (authored by stephan.dollberg, committed by bkramer). · Explain WhyApr 16 2020, 2:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
1 line

Diff 257998

clang/lib/Driver/ToolChains/Gnu.cpp

Show First 20 Lines • Show All 1,971 Lines • ▼ Show 20 Lines for (llvm::vfs::directory_iterator LI = D.getVFS().dir_begin(PrefixDir, EC),
Prefixes.push_back(CandidatePrefix); Prefixes.push_back(CandidatePrefix);
} }
return; return;
} }
// Non-Solaris is much simpler - most systems just go with "/usr". // Non-Solaris is much simpler - most systems just go with "/usr".
if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) { if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) {
// Yet, still look for RHEL devtoolsets. // Yet, still look for RHEL devtoolsets.
Prefixes.push_back("/opt/rh/devtoolset-9/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-8/root/usr"); Prefixes.push_back("/opt/rh/devtoolset-8/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-7/root/usr"); Prefixes.push_back("/opt/rh/devtoolset-7/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-6/root/usr"); Prefixes.push_back("/opt/rh/devtoolset-6/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-4/root/usr"); Prefixes.push_back("/opt/rh/devtoolset-4/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-3/root/usr"); Prefixes.push_back("/opt/rh/devtoolset-3/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-2/root/usr"); Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");
} }
Prefixes.push_back(SysRoot.str() + "/usr"); Prefixes.push_back(SysRoot.str() + "/usr");
▲ Show 20 Lines • Show All 885 Lines • Show Last 20 Lines