From c6e339a400e46d4784433114aa45a70ea159fc22 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 31 May 2017 10:01:13 +0000 Subject: [PATCH] Revert "Driver: Update devtoolset usage for RHEL" This reverts commit r304292. This was committed accidentally. git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@304295 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 1dd34ae70a..a06a8a5863 100644 --- a/lib/Driver/ToolChains.cpp +++ b/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"); } -- 2.40.0