Commit ea94c6a3 authored by Tom Stellard's avatar Tom Stellard
Browse files

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

llvm-svn: 304292
parent 681ad610

clang/lib/Driver/ToolChains.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1442,11 +1442,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");

    }