OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

ccc: Add appropriate file search prefixes when on x86_64 Darwin, and 

look for crt3.o appropriately.

llvm-svn: 62694
This commit is contained in:
Daniel Dunbar 2009-01-21 17:18:19 +00:00
parent 7e6b932f18
commit f2e3d81cb4
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/tools/ccc/ccclib/ToolChain.py
View File

@ -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):

4
clang/tools/ccc/ccclib/Tools.py
View File

@ -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)