diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-01-21 17:18:19 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-01-21 17:18:19 +0000 |
| commit | 7023082bee46edda32c19306733784a30a8656ab (patch) | |
| tree | 3b9faaacd922f721e45ef728448456df0c91806c | |
| parent | d0a69696acca62798dfc8b98f97c92bfa7fa0490 (diff) | |
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
| -rw-r--r-- | tools/ccc/ccclib/ToolChain.py | 16 | ||||
| -rw-r--r-- | tools/ccc/ccclib/Tools.py | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/tools/ccc/ccclib/ToolChain.py b/tools/ccc/ccclib/ToolChain.py index 20582a2b26..d0c1fe19f5 100644 --- a/tools/ccc/ccclib/ToolChain.py +++ b/tools/ccc/ccclib/ToolChain.py @@ -75,19 +75,25 @@ class Darwin_X86_ToolChain(ToolChain): 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): diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py index ae170d8ac2..fbf17cb3a7 100644 --- a/tools/ccc/ccclib/Tools.py +++ b/tools/ccc/ccclib/Tools.py @@ -1006,9 +1006,7 @@ class Darwin_X86_LinkTool(Tool): 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) |