diff options
| author |   Tom Stellard <tstellar@redhat.com> | 2017-05-31 10:01:13 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2017-05-31 10:01:13 +0000 |
| commit | 0405854650e75dba8552ea406d69d3d98f8de032 (patch) | |
| tree | b6bd47f0846d65a4d9e2efbb8cfda6318126f1e0 | |
| parent | Merging r298177: (diff) | |
| download | llvm-project-0405854650e75dba8552ea406d69d3d98f8de032.tar.gz llvm-project-0405854650e75dba8552ea406d69d3d98f8de032.tar.bz2 llvm-project-0405854650e75dba8552ea406d69d3d98f8de032.zip | |
Revert "Driver: Update devtoolset usage for RHEL"
This reverts commit r304292.
This was committed accidentally.
llvm-svn: 304295
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 1dd34ae70a70..a06a8a586336 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -1442,10 +1442,11 @@ 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"); } |