[cfe-commits] r62632 - in /cfe/tags/Apple/clang/clang: Makefile.rules tools/Makefile tools/clang/tools/ccc/ccclib/ToolChain.py tools/clang/tools/ccc/ccclib/Tools.py

[Mike Stump]

Author: mrs
Date: Tue Jan 20 17:02:18 2009
New Revision: 62632

URL: http://llvm.org/viewvc/llvm-project?rev=62632&view=rev
Log:
Apple clang-[12].patch.

Modified:
    cfe/tags/Apple/clang/clang/Makefile.rules
    cfe/tags/Apple/clang/clang/tools/Makefile
    cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/ToolChain.py
    cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/Tools.py

Modified: cfe/tags/Apple/clang/clang/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/Makefile.rules?rev=62632&r1=62631&r2=62632&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/Makefile.rules (original)
+++ cfe/tags/Apple/clang/clang/Makefile.rules Tue Jan 20 17:02:18 2009
@@ -568,7 +568,6 @@
 # To create other directories, as needed, and timestamp their creation
 %/.dir:
 	$(Verb) $(MKDIR) $* > /dev/null
-	$(Verb) $(DATE) > $@
 
 .PRECIOUS: $(ObjDir)/.dir $(LibDir)/.dir $(ToolDir)/.dir $(ExmplDir)/.dir
 .PRECIOUS: $(LLVMLibDir)/.dir $(LLVMToolDir)/.dir $(LLVMExmplDir)/.dir

Modified: cfe/tags/Apple/clang/clang/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/Makefile?rev=62632&r1=62631&r2=62632&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/Makefile (original)
+++ cfe/tags/Apple/clang/clang/tools/Makefile Tue Jan 20 17:02:18 2009
@@ -8,11 +8,13 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
+CLANG_DIR := $(shell test -e clang && echo clang)
+
 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
 PARALLEL_DIRS := llvm-config  \
-                 opt llvm-as llvm-dis \
+                 opt $(CLANG_DIR) llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
 		 lli gccas gccld llvm-extract llvm-db \

Modified: cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/ToolChain.py
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/ToolChain.py?rev=62632&r1=62631&r2=62632&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/ToolChain.py (original)
+++ cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/ToolChain.py Tue Jan 20 17:02:18 2009
@@ -59,15 +59,16 @@
             Phases.LinkPhase : Tools.Darwin_X86_LinkTool(self),
             Phases.LipoPhase : Tools.LipoTool(),
             }
-        self.clangTool = Tools.Clang_CompileTool()
+        self.clangTool = Tools.Clang_CompileTool(self)
 
     def getToolChainDir(self):
         return 'i686-apple-darwin%d/%s' % (self.darwinVersion[0],
                                            '.'.join(map(str,self.gccVersion)))
 
     def getProgramPath(self, name):
-        # FIXME: Implement proper search.
-        return '/usr/libexec/gcc/%s/%s' % (self.getToolChainDir(), name)
+        return '%s/../libexec/gcc/%s/%s' % (self.driver.driverDir,
+                                            self.getToolChainDir(),
+                                            name)
 
     def getMacosxVersionMin(self):
         major,minor,minorminor = self.darwinVersion

Modified: cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/Tools.py
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/Tools.py?rev=62632&r1=62631&r2=62632&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/Tools.py (original)
+++ cfe/tags/Apple/clang/clang/tools/clang/tools/ccc/ccclib/Tools.py Tue Jan 20 17:02:18 2009
@@ -163,11 +163,12 @@
                                  cmd_args))
 
 class Clang_CompileTool(Tool):
-    def __init__(self):
+    def __init__(self, toolChain):
         super(Clang_CompileTool, self).__init__('clang',
                                    (Tool.eFlagsPipedInput |
                                     Tool.eFlagsPipedOutput |
                                     Tool.eFlagsIntegratedCPP))
+        self.toolChain = toolChain
 
     def constructJob(self, phase, arch, jobs, inputs, 
                      output, outputType, arglist, linkingOutput):
@@ -263,7 +264,7 @@
             else:
                 cmd_args.extend(arglist.renderAsInput(input.source))
             
-        jobs.addJob(Jobs.Command('clang', cmd_args))
+        jobs.addJob(Jobs.Command('%s/clang' % self.toolChain.driver.driverDir, cmd_args))
         
 class Darwin_X86_CC1Tool(Tool):
     def getCC1Name(self, type):