maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[driver] Make the driver to link the simulator arclite lib when passing -mios-simulator-version-min. 

rdar://10218700

llvm-svn: 142372
This commit is contained in:
Argyrios Kyrtzidis 2011-10-18 17:40:15 +00:00
parent 9258b76d8d
commit 058b451d87
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Driver/ToolChains.cpp
View File

@ -371,9 +371,11 @@ void DarwinClang::AddLinkARCArgs(const ArgList &Args,
P.appendComponent("libarclite_"); P.appendComponent("libarclite_");
std::string s = P.str(); std::string s = P.str();
// Mash in the platform. // Mash in the platform.
if (isTargetIPhoneOS()) if (isTargetIOSSimulator())
s += "iphonesimulator";
else if (isTargetIPhoneOS())
s += "iphoneos"; s += "iphoneos";
// FIXME: isTargetIphoneOSSimulator() is not returning true. // FIXME: Remove this once we depend fully on -mios-simulator-version-min.
else if (ARCRuntimeForSimulator != ARCSimulator_None) else if (ARCRuntimeForSimulator != ARCSimulator_None)
s += "iphonesimulator"; s += "iphonesimulator";
else else
@ -495,7 +497,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
// '-miphoneos-version-min' to help us know whether there is an ARC runtime // '-miphoneos-version-min' to help us know whether there is an ARC runtime
// or not; try to parse a __IPHONE_OS_VERSION_MIN_REQUIRED // or not; try to parse a __IPHONE_OS_VERSION_MIN_REQUIRED
// define passed in command-line. // define passed in command-line.
if (!iOSVersion) { if (!iOSVersion && !iOSSimVersion) {
for (arg_iterator it = Args.filtered_begin(options::OPT_D), for (arg_iterator it = Args.filtered_begin(options::OPT_D),
ie = Args.filtered_end(); it != ie; ++it) { ie = Args.filtered_end(); it != ie; ++it) {
StringRef define = (*it)->getValue(Args); StringRef define = (*it)->getValue(Args);