[PATCH] Update usage of RHEL devtoolsets

[Michael Lampe via cfe-commits]

- remove devtoolset-1 (obsoleted gcc 4.7)
- add devtoolset-6 (gcc 6.2+)

(There is no devtoolset-5, RH switched to gcc major version numbering.)

Please apply, I don't have commit access.

Thanks,

Michael



diff -ru a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
--- a/lib/Driver/ToolChains.cpp 2016-11-26 03:21:16.353564220 +0100
+++ b/lib/Driver/ToolChains.cpp 2016-11-26 03:24:40.096334795 +0100
@@ -1441,11 +1441,10 @@
     // Then look for distribution supplied gcc installations.
     if (D.SysRoot.empty()) {
       // Look for RHEL devtoolsets.
+      Prefixes.push_back("/opt/rh/devtoolset-6/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-2/root/usr");
-      Prefixes.push_back("/opt/rh/devtoolset-1.1/root/usr");
-      Prefixes.push_back("/opt/rh/devtoolset-1.0/root/usr");
       // And finally in /usr.
       Prefixes.push_back("/usr");
     }

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits