This is an archive of the discontinued LLVM Phabricator instance.

[Driver] Try normalized triple when looking for C++ libraries
ClosedPublic

Authored by phosek on May 22 2019, 11:15 PM.

Reviewers

leonardchan
mcgrathr

Commits

Summary

This addresses the issue introduced in r361432 where we would only
try effective triple but not the normalized one as we do for other
runtimes.

This revision was not accepted when it landed; it landed in state Needs Review.May 23 2019, 8:20 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

lib/

Driver/

5 lines

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines	: D(D), Triple(T), Args(Args), CachedRTTIArg(GetRTTIArgument(Args)),
CachedRTTIMode(CalculateRTTIMode(Args, Triple, CachedRTTIArg)) {		CachedRTTIMode(CalculateRTTIMode(Args, Triple, CachedRTTIArg)) {
SmallString<128> P;		SmallString<128> P;

if (D.CCCIsCXX()) {		if (D.CCCIsCXX()) {
P.assign(D.Dir);		P.assign(D.Dir);
llvm::sys::path::append(P, "..", "lib", D.getTargetTriple(), "c++");		llvm::sys::path::append(P, "..", "lib", D.getTargetTriple(), "c++");
if (getVFS().exists(P))		if (getVFS().exists(P))
getLibraryPaths().push_back(P.str());		getLibraryPaths().push_back(P.str());

		P.assign(D.Dir);
		llvm::sys::path::append(P, "..", "lib", Triple.str(), "c++");
		if (getVFS().exists(P))
		getLibraryPaths().push_back(P.str());
}		}

P.assign(D.ResourceDir);		P.assign(D.ResourceDir);
llvm::sys::path::append(P, D.getTargetTriple(), "lib");		llvm::sys::path::append(P, D.getTargetTriple(), "lib");
if (getVFS().exists(P))		if (getVFS().exists(P))
getLibraryPaths().push_back(P.str());		getLibraryPaths().push_back(P.str());

P.assign(D.ResourceDir);		P.assign(D.ResourceDir);
▲ Show 20 Lines • Show All 928 Lines • Show Last 20 Lines