]> granicus.if.org Git - clang/commitdiff
Driver: Update devtoolset usage for RHEL
authorTom Stellard <tstellar@redhat.com>
Tue, 28 Feb 2017 16:46:19 +0000 (16:46 +0000)
committerTom Stellard <tstellar@redhat.com>
Tue, 28 Feb 2017 16:46:19 +0000 (16:46 +0000)
- 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

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

lib/Driver/ToolChains.cpp

index 495cc0a73b7e14d08561d58e6c9ef86725b541b5..26c4fca9aaf548474bf6954880d33decb88cbdf7 100644 (file)
@@ -1438,11 +1438,10 @@ void Generic_GCC::GCCInstallationDetector::init(
     // 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");
     }