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.

Download Raw Diff

Details

Reviewers

• rafael
tstellar

Commits

rGea94c6a3dbf4: Driver: Update devtoolset usage for RHEL
rGd088de61168a: Driver: Update devtoolset usage for RHEL
rC296485: Driver: Update devtoolset usage for RHEL
rL304292: Driver: Update devtoolset usage for RHEL
rL296485: Driver: Update devtoolset usage for RHEL

Summary

remove path to dts-1.x (corresponds to gcc 4.7)
add path to dts-6 (corresponds to 6.x)

Diff Detail

Repository: rL LLVM

Event Timeline

schalk created this revision.Feb 10 2017, 3:17 PM

schalk added a reviewer: • rafael.Feb 10 2017, 8:03 PM

tstellar added a subscriber: tstellar.Feb 13 2017, 6:48 AM

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.

Closed by commit rL296485: Driver: Update devtoolset usage for RHEL (authored by tstellar). · Explain WhyFeb 28 2017, 8:58 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

cfe/

trunk/

lib/

Driver/

ToolChains.cpp

3 lines

Diff 90045

cfe/trunk/lib/Driver/ToolChains.cpp

Show First 20 Lines • Show All 1,432 Lines • ▼ Show 20 Lines	if (GCCToolchainDir != "") {
}		}

// Then look for gcc installed alongside clang.		// Then look for gcc installed alongside clang.
Prefixes.push_back(D.InstalledDir + "/..");		Prefixes.push_back(D.InstalledDir + "/..");

// 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");
}		}
}		}

// Try to respect gcc-config on Gentoo. However, do that only		// Try to respect gcc-config on Gentoo. However, do that only
// if --gcc-toolchain is not provided or equal to the Gentoo install		// if --gcc-toolchain is not provided or equal to the Gentoo install
// in /usr. This avoids accidentally enforcing the system GCC version		// in /usr. This avoids accidentally enforcing the system GCC version
▲ Show 20 Lines • Show All 3,908 Lines • Show Last 20 Lines