This is an archive of the discontinued LLVM Phabricator instance.

Update devtoolset usage for RHEL
ClosedPublic

Authored by schalk on Feb 10 2017, 3:17 PM.

Reviewers

• rafael
tstellar

Commits

Summary

LGTM.

This revision is now accepted and ready to land.Feb 13 2017, 10:47 AM

If ok, please commit. I don't have write access.

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

lib/

Driver/

	ToolChains.cpp
	ToolChains.cpp~

3 lines

Context not available.
	// Then look for distribution supplied gcc installations.	// Then look for distribution supplied gcc installations.
	if (D.SysRoot.empty()) {	if (D.SysRoot.empty()) {
	// Look for RHEL devtoolsets.	// 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-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("/opt/rh/devtoolset-1.1/root/usr");
	Prefixes.push_back("/opt/rh/devtoolset-1.0/root/usr");
	// And finally in /usr.	// And finally in /usr.
	Prefixes.push_back("/usr");	Prefixes.push_back("/usr");
	}	}
Context not available.