This is an archive of the discontinued LLVM Phabricator instance.

Driver: Add OS-specific resource directory to file search paths.
Needs ReviewPublic

Authored by Shiz on May 26 2015, 6:13 PM.

Download Raw Diff

This revision needs review, but there are no reviewers specified.

Details

Reviewers: None

Summary

This patch adds the OS-specific resource directory ($resourcedir/lib/$os) to the default file search paths when invoking Driver::GetFilePath.
This allows it to find the non-generic files it may need, as well as making the GCC-compatible driver's -print-file-name work with e.g. the libclang_rt.*.a files.

Diff Detail

Event Timeline

Shiz updated this revision to Diff 26561.May 26 2015, 6:13 PM

Shiz retitled this revision from to Driver: Add OS-specific resource directory to file search paths..

Shiz updated this object.

Shiz edited the test plan for this revision. (Show Details)

Shiz added a subscriber: Unknown Object (MLST).

Implemented by D31447

Revision Contents

Path

Size

lib/

Driver/

Driver.cpp

8 lines

Diff 26561

lib/Driver/Driver.cpp

Context not available.
	if (llvm::sys::fs::exists(Twine(P)))	if (llvm::sys::fs::exists(Twine(P)))
	return P.str();	return P.str();

		P = ResourceDir;
		// TC.getOSName() yields "freebsd10.0" whereas "freebsd" is expected.
		StringRef OSLibName = (TC.getTriple().getOS() == llvm::Triple::FreeBSD)
		? "freebsd" : TC.getTriple().getOSName();
		llvm::sys::path::append(P, "lib", OSLibName, Name);
		if (llvm::sys::fs::exists(Twine(P)))
		return P.str();

	const ToolChain::path_list &List = TC.getFilePaths();	const ToolChain::path_list &List = TC.getFilePaths();
	for (ToolChain::path_list::const_iterator	for (ToolChain::path_list::const_iterator
	it = List.begin(), ie = List.end(); it != ie; ++it) {	it = List.begin(), ie = List.end(); it != ie; ++it) {
Context not available.