[cfe-commits] r67607 - in /cfe/trunk: lib/Driver/ToolChains.cpp tools/ccc/ccclib/ToolChain.py tools/clang-cc/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Mon Mar 23 23:07:10 2009
New Revision: 67607

URL: http://llvm.org/viewvc/llvm-project?rev=67607&view=rev
Log:
Install clang-cc to libexec/clang-cc (instead of bin/clang-cc).
 - Updated ccc & driver to look in libexec/ for tools.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp
    cfe/trunk/tools/ccc/ccclib/ToolChain.py
    cfe/trunk/tools/clang-cc/Makefile

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=67607&r1=67606&r2=67607&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Mon Mar 23 23:07:10 2009
@@ -74,6 +74,10 @@
   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 @@
                          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);  
 }
 

Modified: cfe/trunk/tools/ccc/ccclib/ToolChain.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/ccclib/ToolChain.py?rev=67607&r1=67606&r2=67607&view=diff

==============================================================================
--- cfe/trunk/tools/ccc/ccclib/ToolChain.py (original)
+++ cfe/trunk/tools/ccc/ccclib/ToolChain.py Mon Mar 23 23:07:10 2009
@@ -139,6 +139,8 @@
                                                   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 @@
             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):

Modified: cfe/trunk/tools/clang-cc/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-cc/Makefile?rev=67607&r1=67606&r2=67607&view=diff

==============================================================================
--- cfe/trunk/tools/clang-cc/Makefile (original)
+++ cfe/trunk/tools/clang-cc/Makefile Mon Mar 23 23:07:10 2009
@@ -25,4 +25,8 @@
            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