diff options
author | Tom Stellard <tstellar@redhat.com> | 2017-05-31 09:58:32 +0000 |
---|---|---|
committer | Tom Stellard <tstellar@redhat.com> | 2017-05-31 09:58:32 +0000 |
commit | 9b5539e2ce96af00c820c471ffffa76011764e51 (patch) | |
tree | e7af56322acff3887c4c8e08f20422083fd0aa79 | |
parent | 21fe7e8f8ab44b67238af7bf9ba9d8afdf0c0e2c (diff) |
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
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@304292 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Driver/ToolChains.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 9bc9ae4f6a..5ddc32bfc6 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -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"); } |