This is an archive of the discontinued LLVM Phabricator instance.

Remove duplicated alteration to getProgramPaths().
ClosedPublic

Authored by dougk on Jun 15 2015, 8:50 AM.

Reviewers

t.p.northover

Commits

Summary

This seems to have been unintentional but was preserved across several moves of the code, so... not quite sure why.

dougk retitled this revision from to Remove duplicated alteration to getProgramPaths()..

dougk updated this object.

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

dougk added a reviewer: t.p.northover.

dougk added a subscriber: Unknown Object (MLST).

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

trunk/

lib/

Driver/

4 lines

	Show All 36 Lines
	using namespace clang::driver;			using namespace clang::driver;
	using namespace clang::driver::toolchains;			using namespace clang::driver::toolchains;
	using namespace clang;			using namespace clang;
	using namespace llvm::opt;			using namespace llvm::opt;

	MachO::MachO(const Driver &D, const llvm::Triple &Triple,			MachO::MachO(const Driver &D, const llvm::Triple &Triple,
	const ArgList &Args)			const ArgList &Args)
	: ToolChain(D, Triple, Args) {			: ToolChain(D, Triple, Args) {
	getProgramPaths().push_back(getDriver().getInstalledDir());
	if (getDriver().getInstalledDir() != getDriver().Dir)
	getProgramPaths().push_back(getDriver().Dir);

	// We expect 'as', 'ld', etc. to be adjacent to our install dir.			// We expect 'as', 'ld', etc. to be adjacent to our install dir.
	getProgramPaths().push_back(getDriver().getInstalledDir());			getProgramPaths().push_back(getDriver().getInstalledDir());
	if (getDriver().getInstalledDir() != getDriver().Dir)			if (getDriver().getInstalledDir() != getDriver().Dir)
	getProgramPaths().push_back(getDriver().Dir);			getProgramPaths().push_back(getDriver().Dir);
	}			}

	/// Darwin - Darwin tool chain for i386 and x86_64.			/// Darwin - Darwin tool chain for i386 and x86_64.
	Darwin::Darwin(const Driver & D, const llvm::Triple & Triple,			Darwin::Darwin(const Driver & D, const llvm::Triple & Triple,
	▲ Show 20 Lines • Show All 3,690 Lines • Show Last 20 Lines