[clang] 7b9c6c1 - Also look for devtoolset-9 gcc toolchain

[Benjamin Kramer via cfe-commits]

Author: Stephan Dollberg
Date: 2020-04-16T11:17:39+02:00
New Revision: 7b9c6c16c33deb52e7081f94ad51e3910ca592c9

URL: https://github.com/llvm/llvm-project/commit/7b9c6c16c33deb52e7081f94ad51e3910ca592c9
DIFF: https://github.com/llvm/llvm-project/commit/7b9c6c16c33deb52e7081f94ad51e3910ca592c9.diff

LOG: Also look for devtoolset-9 gcc toolchain

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

Differential Revision: https://reviews.llvm.org/D77420

Added: 
    

Modified: 
    clang/lib/Driver/ToolChains/Gnu.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index d20d62987589..0ea33fc20e86 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -1977,6 +1977,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
   // 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.
+    Prefixes.push_back("/opt/rh/devtoolset-9/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-6/root/usr");