commit c6e339a400e46d4784433114aa45a70ea159fc22
author Tom Stellard <tstellar@redhat.com> Wed May 31 10:01:13 2017 +0000
committer Tom Stellard <tstellar@redhat.com> Wed May 31 10:01:13 2017 +0000
tree c580cf0262b82529cec40769ea9da779ff8a3606
parent 8bd8e90853ec347c5cf68ff7d01fa195d2ab22fc

Revert "Driver: Update devtoolset usage for RHEL"

This reverts commit r304292.

This was committed accidentally.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@304295 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/ToolChains.cpp

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 1dd34ae..a06a8a5 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -1442,10 +1442,11 @@
     // 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");
     }