commit e28f9e9fc9763ddf602997630da2f6fd64daea72
author Daniel Dunbar <daniel@zuster.org> Wed Jan 21 17:18:19 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Wed Jan 21 17:18:19 2009 +0000
tree 3b9faaacd922f721e45ef728448456df0c91806c
parent 8b2aa2244f95bafc94e2e143f128214c5328d553

ccc: Add appropriate file search prefixes when on x86_64 Darwin, and
look for crt3.o appropriately.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62694 91177308-0d34-0410-b5e6-96231b3b80d8

tools/ccc/ccclib/ToolChain.py

diff --git a/tools/ccc/ccclib/ToolChain.py b/tools/ccc/ccclib/ToolChain.py
index 20582a2..d0c1fe1 100644
--- a/tools/ccc/ccclib/ToolChain.py
+++ b/tools/ccc/ccclib/ToolChain.py
@@ -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):