This is an archive of the discontinued LLVM Phabricator instance.

Differential D92792

[clang] - Also look for devtoolset-10
ClosedPublic

Authored by stephan.dollberg on Dec 7 2020, 3:06 PM.

Details

Reviewers
phosek
chandlerc
Commits
rGf67d3dbdb930: [clang] - Also look for devtoolset-10
Summary

devtoolset-10 has just been released so look for it as well.

Diff Detail

Event Timeline

stephan.dollberg requested review of this revision.Dec 7 2020, 3:06 PM
stephan.dollberg created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptDec 7 2020, 3:06 PM
Harbormaster completed remote builds in B81360: Diff 310030.Dec 7 2020, 3:36 PM
phosek accepted this revision.Dec 7 2020, 10:55 PM

LGTM

This revision is now accepted and ready to land.Dec 7 2020, 10:55 PM
stephan.dollberg added a comment.Dec 8 2020, 1:31 AM

Thanks @phosek , can you merge it please? I don't have perms.

stephan.dollberg added a comment.Dec 30 2020, 8:52 AM

Ping @phosek

This revision was landed with ongoing or failed builds.Jan 4 2021, 2:26 PM
Closed by commit rGf67d3dbdb930: [clang] - Also look for devtoolset-10 (authored by phosek). · Explain Why
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rGf67d3dbdb930: [clang] - Also look for devtoolset-10.
phosek added a comment.Jan 4 2021, 3:36 PM
In D92792#2475182, @stephan.dollberg wrote:

Ping @phosek

Merged, sorry about the delay.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
1 line

Diff 314456

clang/lib/Driver/ToolChains/Gnu.cpp

Show First 20 Lines • Show All 2,043 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-10/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-9/root/usr"); 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");
} }
▲ Show 20 Lines • Show All 1,047 Lines • Show Last 20 Lines