[llvm-branch-commits] [cfe-branch] r304292 - Driver: Update devtoolset usage for RHEL

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed May 31 04:58:32 2017
New Revision: 304292

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

- remove path to dts-1.x (corresponds to gcc 4.7)
- add path to dts-6 (corresponds to 6.x)

Patch By: Maria Gottschalk

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

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=304292&r1=304291&r2=304292&view=diff
==============================================================================
--- cfe/branches/release_40/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_40/lib/Driver/ToolChains.cpp Wed May 31 04:58:32 2017
@@ -1442,11 +1442,10 @@ 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");
     }