Install clang-cc to libexec/clang-cc (instead of bin/clang-cc).

- Updated ccc & driver to look in libexec/ for tools.

llvm-svn: 67607
This commit is contained in:
Daniel Dunbar 2009-03-24 04:07:10 +00:00
parent 36245c5a90
commit 2dbe89af65
3 changed files with 16 additions and 0 deletions
clang
lib/Driver
tools
ccc/ccclib
clang-cc

View File

@ -74,6 +74,10 @@ Darwin_X86::Darwin_X86(const HostInfo &Host, const char *Arch,
Path += getToolChainDir();
getProgramPaths().push_back(Path);
Path = getHost().getDriver().Dir;
Path += "/../libexec";
getProgramPaths().push_back(Path);
getProgramPaths().push_back(getHost().getDriver().Dir);
}
@ -151,6 +155,10 @@ Generic_GCC::Generic_GCC(const HostInfo &Host, const char *Arch,
const char *Platform, const char *OS)
: ToolChain(Host, Arch, Platform, OS)
{
std::string Path(getHost().getDriver().Dir);
Path += "/../libexec";
getProgramPaths().push_back(Path);
getProgramPaths().push_back(getHost().getDriver().Dir);
}

View File

@ -139,6 +139,8 @@ class Darwin_X86_ToolChain(ToolChain):
self.getToolChainDir()))
self.programPathPrefixes.append(os.path.join('/usr/libexec/gcc',
self.getToolChainDir()))
self.programPathPrefixes.append(os.path.join(self.driver.driverDir,
'../libexec'))
self.programPathPrefixes.append(self.driver.driverDir)
def getToolChainDir(self):
@ -262,6 +264,8 @@ class Generic_GCC_ToolChain(ToolChain):
Phases.AssemblePhase : Tools.GCC_AssembleTool(self),
Phases.LinkPhase : Tools.GCC_LinkTool(self),
}
self.programPathPrefixes.append(os.path.join(self.driver.driverDir,
'../libexec'))
self.programPathPrefixes.append(self.driver.driverDir)
def selectTool(self, action):

View File

@ -25,4 +25,8 @@ USEDLIBS = clangCodeGen.a clangAnalysis.a clangRewrite.a clangSema.a \
clangFrontend.a clangAST.a clangParse.a clangLex.a \
clangBasic.a
# clang-cc lives in a special location; we can get away with this
# because nothing else gets installed from here.
PROJ_bindir := $(DESTDIR)$(PROJ_prefix)/libexec
include $(LLVM_SRC_ROOT)/Makefile.rules