Revert "TMP"
This reverts r209433. Sorry about that, it needs a test & better message. llvm-svn: 209435
This commit is contained in:
parent
e5c6f4c304
commit
cc346a92e3
|
@ -45,14 +45,6 @@ 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.
|
|
||||||
getProgramPaths().push_back(getDriver().getInstalledDir());
|
|
||||||
if (getDriver().getInstalledDir() != 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.
|
||||||
|
@ -240,6 +232,14 @@ Tool *MachO::buildAssembler() const {
|
||||||
DarwinClang::DarwinClang(const Driver &D, const llvm::Triple& Triple,
|
DarwinClang::DarwinClang(const Driver &D, const llvm::Triple& Triple,
|
||||||
const ArgList &Args)
|
const ArgList &Args)
|
||||||
: Darwin(D, Triple, Args) {
|
: Darwin(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.
|
||||||
|
getProgramPaths().push_back(getDriver().getInstalledDir());
|
||||||
|
if (getDriver().getInstalledDir() != getDriver().Dir)
|
||||||
|
getProgramPaths().push_back(getDriver().Dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DarwinClang::addClangWarningOptions(ArgStringList &CC1Args) const {
|
void DarwinClang::addClangWarningOptions(ArgStringList &CC1Args) const {
|
||||||
|
|
Loading…
Reference in New Issue