[PATCH] D108908: [clang] Add gcc-toolset-10 support (RHEL/CentOS 8)
Simon Moll via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Aug 30 04:34:23 PDT 2021
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
simoll marked an inline comment as done.
Closed by commit rGa5791badde32: [clang] Add gcc-toolset-10 support (RHEL/CentOS 8) (authored by simoll).
Changed prior to commit:
https://reviews.llvm.org/D108908?vs=369399&id=369414#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D108908/new/
https://reviews.llvm.org/D108908
Files:
clang/lib/Driver/ToolChains/Gnu.cpp
clang/lib/Driver/ToolChains/Linux.cpp
Index: clang/lib/Driver/ToolChains/Linux.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Linux.cpp
+++ clang/lib/Driver/ToolChains/Linux.cpp
@@ -206,8 +206,7 @@
ExtraOpts.push_back("max-page-size=4096");
}
- if (GCCInstallation.getParentLibPath().find("opt/rh/devtoolset") !=
- StringRef::npos)
+ if (GCCInstallation.getParentLibPath().find("opt/rh/") != StringRef::npos)
// With devtoolset 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
Index: clang/lib/Driver/ToolChains/Gnu.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Gnu.cpp
+++ clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2052,7 +2052,8 @@
// Non-Solaris is much simpler - most systems just go with "/usr".
if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) {
- // Yet, still look for RHEL devtoolsets.
+ // Yet, still look for RHEL/CentOS devtoolsets and gcc-toolsets.
+ Prefixes.push_back("/opt/rh/gcc-toolset-10/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-10/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-9/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-8/root/usr");
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D108908.369414.patch
Type: text/x-patch
Size: 1392 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20210830/cfe233e0/attachment-0001.bin>
More information about the cfe-commits
mailing list