From 058b451d87c8f7d704ca151d11e92beaf3a88d51 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Tue, 18 Oct 2011 17:40:15 +0000 Subject: [PATCH] [driver] Make the driver to link the simulator arclite lib when passing -mios-simulator-version-min. rdar://10218700 llvm-svn: 142372 --- clang/lib/Driver/ToolChains.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 825a83d8b8d8..dd92266ec67e 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -371,9 +371,11 @@ void DarwinClang::AddLinkARCArgs(const ArgList &Args, P.appendComponent("libarclite_"); std::string s = P.str(); // Mash in the platform. - if (isTargetIPhoneOS()) + if (isTargetIOSSimulator()) + s += "iphonesimulator"; + else if (isTargetIPhoneOS()) 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) s += "iphonesimulator"; else @@ -495,7 +497,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const { // '-miphoneos-version-min' to help us know whether there is an ARC runtime // or not; try to parse a __IPHONE_OS_VERSION_MIN_REQUIRED // define passed in command-line. - if (!iOSVersion) { + if (!iOSVersion && !iOSSimVersion) { for (arg_iterator it = Args.filtered_begin(options::OPT_D), ie = Args.filtered_end(); it != ie; ++it) { StringRef define = (*it)->getValue(Args);