[cfe-commits] r62694 - in /cfe/trunk/tools/ccc/ccclib: ToolChain.py Tools.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jan 21 11:18:19 2009
New Revision: 62694

URL: http://llvm.org/viewvc/llvm-project?rev=62694&view=rev
Log:
ccc: Add appropriate file search prefixes when on x86_64 Darwin, and
look for crt3.o appropriately.

Modified:
    cfe/trunk/tools/ccc/ccclib/ToolChain.py
    cfe/trunk/tools/ccc/ccclib/Tools.py

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

==============================================================================
--- cfe/trunk/tools/ccc/ccclib/ToolChain.py (original)
+++ cfe/trunk/tools/ccc/ccclib/ToolChain.py Wed Jan 21 11:18:19 2009
@@ -75,19 +75,25 @@
             Phases.LipoPhase : Tools.LipoTool(),
             }
 
+        if archName == 'x86_64':
+            self.filePathPrefixes.append(os.path.join(self.driver.driverDir,
+                                                      '../lib/gcc',
+                                                      self.getToolChainDir(),
+                                                      'x86_64'))
+            self.filePathPrefixes.append(os.path.join('/usr/lib/gcc',
+                                                      self.getToolChainDir(),
+                                                      'x86_64'))
         self.filePathPrefixes.append(os.path.join(self.driver.driverDir,
                                                   '../lib/gcc',
                                                   self.getToolChainDir()))
-        self.filePathPrefixes.append(os.path.join(self.driver.driverDir,
-                                                  '/usr/lib/gcc',
+        self.filePathPrefixes.append(os.path.join('/usr/lib/gcc',
                                                   self.getToolChainDir()))
 
         self.programPathPrefixes.append(os.path.join(self.driver.driverDir,
                                                   '../libexec/gcc',
                                                   self.getToolChainDir()))
-        self.programPathPrefixes.append(os.path.join(self.driver.driverDir,
-                                                  '/usr/libexec/gcc',
-                                                  self.getToolChainDir()))
+        self.programPathPrefixes.append(os.path.join('/usr/libexec/gcc',
+                                                     self.getToolChainDir()))
         self.programPathPrefixes.append(self.driver.driverDir)
 
     def getToolChainDir(self):

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

==============================================================================
--- cfe/trunk/tools/ccc/ccclib/Tools.py (original)
+++ cfe/trunk/tools/ccc/ccclib/Tools.py Wed Jan 21 11:18:19 2009
@@ -1006,9 +1006,7 @@
             if arglist.getLastArg(arglist.parser.sharedLibgccOption):
                 if not arglist.getLastArg(arglist.parser.m_iphoneosVersionMinOption):
                     if macosxVersion < (10,5):
-                        # FIXME: gcc does a library search for this
-                        # file, this will be be broken currently.
-                        cmd_args.append('crt3.o')
+                        cmd_args.append(self.toolChain.getFilePath('crt3.o'))
 
         arglist.addAllArgs(cmd_args, arglist.parser.LOption)