This is an archive of the discontinued LLVM Phabricator instance.

Also look for devtoolset-9 gcc toolchain
ClosedPublic

Authored by stephan.dollberg on Apr 3 2020, 11:11 AM.

Download Raw Diff

Details

Reviewers

chandlerc
aganea
bkramer

Commits

rG7b9c6c16c33d: Also look for devtoolset-9 gcc toolchain

Summary

devtoolset-9 has been out for a while so also look for it.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

stephan.dollberg created this revision.Apr 3 2020, 11:11 AM

Herald added a project: Restricted Project. · View Herald TranscriptApr 3 2020, 11:11 AM

stephan.dollberg added reviewers: aganea, bkramer.Apr 15 2020, 3:10 PM

looks good

This revision is now accepted and ready to land.Apr 15 2020, 4:01 PM

Thanks, can you merge it? Don't have access.

Closed by commit rG7b9c6c16c33d: Also look for devtoolset-9 gcc toolchain (authored by stephan.dollberg, committed by bkramer). · Explain WhyApr 16 2020, 2:49 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

clang/

lib/

Driver/

ToolChains/

Gnu.cpp

1 line

Diff 254860

clang/lib/Driver/ToolChains/Gnu.cpp

//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------- C++ --===//		//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------- C++ --===//
		Lint: Lint Inline Actions clang-format-diff not found in user's PATH; not linting file. Lint: Lint: clang-format-diff not found in user's PATH; not linting file.
//		//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.		// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.		// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception		// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//		//
//===----------------------------------------------------------------------===//		//===----------------------------------------------------------------------===//

▲ Show 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines	for (llvm::vfs::directory_iterator LI = D.getVFS().dir_begin(PrefixDir, EC),
Prefixes.push_back(CandidatePrefix);		Prefixes.push_back(CandidatePrefix);
}		}
return;		return;
}		}

// Non-Solaris is much simpler - most systems just go with "/usr".		// Non-Solaris is much simpler - most systems just go with "/usr".
if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) {		if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) {
// Yet, still look for RHEL devtoolsets.		// Yet, still look for RHEL devtoolsets.
		Prefixes.push_back("/opt/rh/devtoolset-9/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-8/root/usr");		Prefixes.push_back("/opt/rh/devtoolset-8/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-7/root/usr");		Prefixes.push_back("/opt/rh/devtoolset-7/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-6/root/usr");		Prefixes.push_back("/opt/rh/devtoolset-6/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-4/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-3/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");		Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");
}		}
Prefixes.push_back(SysRoot.str() + "/usr");		Prefixes.push_back(SysRoot.str() + "/usr");
▲ Show 20 Lines • Show All 885 Lines • Show Last 20 Lines