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 | f2e3d81cb41c37910b4fffc81bf1c91424f5792b (patch) | |
| tree | ab9934cced950b8a67bcc6b05a3c91b86afa2944 /clang | |
| parent | 7e6b932f1833a614b0ec6c5046e49fdc3af5c884 (diff) | |
| download | bcm5719-llvm-f2e3d81cb41c37910b4fffc81bf1c91424f5792b.tar.gz bcm5719-llvm-f2e3d81cb41c37910b4fffc81bf1c91424f5792b.zip | |
ccc: Add appropriate file search prefixes when on x86_64 Darwin, and
look for crt3.o appropriately.
llvm-svn: 62694
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/tools/ccc/ccclib/ToolChain.py | 16 | ||||
| -rw-r--r-- | clang/tools/ccc/ccclib/Tools.py | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/clang/tools/ccc/ccclib/ToolChain.py b/clang/tools/ccc/ccclib/ToolChain.py index 20582a2b267..d0c1fe19f5f 100644 --- a/clang/tools/ccc/ccclib/ToolChain.py +++ b/clang/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/clang/tools/ccc/ccclib/Tools.py b/clang/tools/ccc/ccclib/Tools.py index ae170d8ac2f..fbf17cb3a73 100644 --- a/clang/tools/ccc/ccclib/Tools.py +++ b/clang/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) |
