This is an archive of the discontinued LLVM Phabricator instance.

[AVR] Remove duplicate specification of lib directory
ClosedPublic

Authored by dennisschagt on Apr 2 2020, 1:47 PM.

Reviewers

Commits

Nice catch, cheers.

Do you need someone to commit this for you?

This revision is now accepted and ready to land.Apr 11 2020, 1:14 AM

Thanks!

Yes, can you commit it?

Sorry, I lost track of this. Committed in 01741d6dbec11c0a0c8e610f0033831735c78d1e

This revision was automatically updated to reflect the committed changes.

Path

Size

clang/

lib/

Driver/

ToolChains/

2 lines

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Lines	if (CPU.empty()) {
// No avr-libc found and so no runtime linked.		// No avr-libc found and so no runtime linked.
D.Diag(diag::warn_drv_avr_libc_not_found);		D.Diag(diag::warn_drv_avr_libc_not_found);
} else { // We have enough information to link stdlibs		} else { // We have enough information to link stdlibs
std::string GCCRoot = std::string(GCCInstallation.getInstallPath());		std::string GCCRoot = std::string(GCCInstallation.getInstallPath());
std::string LibcRoot = AVRLibcRoot.getValue();		std::string LibcRoot = AVRLibcRoot.getValue();

getFilePaths().push_back(LibcRoot + std::string("/lib/") +		getFilePaths().push_back(LibcRoot + std::string("/lib/") +
std::string(*FamilyName));		std::string(*FamilyName));
getFilePaths().push_back(LibcRoot + std::string("/lib/") +
std::string(*FamilyName));
getFilePaths().push_back(GCCRoot + std::string("/") +		getFilePaths().push_back(GCCRoot + std::string("/") +
std::string(*FamilyName));		std::string(*FamilyName));

LinkStdlib = true;		LinkStdlib = true;
}		}
}		}

if (!LinkStdlib)		if (!LinkStdlib)
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines