[llvm-branch-commits] [cfe-branch] r304295 - Revert "Driver: Update devtoolset usage for RHEL"

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed May 31 05:01:13 2017
New Revision: 304295

URL: http://llvm.org/viewvc/llvm-project?rev=304295&view=rev
Log:
Revert "Driver: Update devtoolset usage for RHEL"

This reverts commit r304292.

This was committed accidentally.

Modified:
    cfe/branches/release_40/lib/Driver/ToolChains.cpp

Modified: cfe/branches/release_40/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/Driver/ToolChains.cpp?rev=304295&r1=304294&r2=304295&view=diff
==============================================================================
--- cfe/branches/release_40/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_40/lib/Driver/ToolChains.cpp Wed May 31 05:01:13 2017
@@ -1442,10 +1442,11 @@ void Generic_GCC::GCCInstallationDetecto
     // 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");
     }