diff options
author | Tom Stellard <tstellar@redhat.com> | 2017-02-28 16:46:19 +0000 |
---|---|---|
committer | Tom Stellard <tstellar@redhat.com> | 2017-02-28 16:46:19 +0000 |
commit | d088de61168a162670cb10d0b99820c5eab849e9 (patch) | |
tree | 4c7e15f92e878dfa36d0e58704324db900cf52c1 | |
parent | 080889cad77a5eac60afda88b4be178f12d6793c (diff) | |
download | bcm5719-llvm-d088de61168a162670cb10d0b99820c5eab849e9.tar.gz bcm5719-llvm-d088de61168a162670cb10d0b99820c5eab849e9.zip |
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: 296485
-rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 495cc0a73b7..26c4fca9aaf 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -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"); } |