diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2014-02-01 21:06:21 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2014-02-01 21:06:21 +0000 |
| commit | 5cfc55e49fefec6fae6ebbd1b99a84aa439c9eb8 (patch) | |
| tree | 9f39b003e7dfd39cb3f45614473942142ebd4a98 /clang/lib | |
| parent | 52b6473d74acaffb9b7a8acfc8fdcd8b5f45a559 (diff) | |
| download | bcm5719-llvm-5cfc55e49fefec6fae6ebbd1b99a84aa439c9eb8.tar.gz bcm5719-llvm-5cfc55e49fefec6fae6ebbd1b99a84aa439c9eb8.zip | |
Fix an assertion failure when building for the iOS simulator. rdar://15959009
When building for i386 or x86_64 with IPHONEOS_DEPLOYMENT_TARGET set in the
environment, the toolchain correctly recognizes that the target platform is
the iOS simulator. The code in Darwin::addMinVersionArgs was not updated for
svn 197148, where isTargetIPhoneOS() was widely replaced by isTargetIOSBased().
This is kind of a strange case, though, because we probably ought to be
passing -ios_simulator_version_min to the linker, but according to the FIXME
in the code, we intentionally avoid that unless the -mios-simulator-version-min
option was used. I don't know whether it is safe to change that yet, so
for now, I am just fixing the assertion failure.
llvm-svn: 200618
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index b2ccb7879d1..2a1521f7c67 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -991,7 +991,7 @@ void Darwin::addMinVersionArgs(const llvm::opt::ArgList &Args, // it. if (Args.hasArg(options::OPT_mios_simulator_version_min_EQ)) CmdArgs.push_back("-ios_simulator_version_min"); - else if (isTargetIPhoneOS()) + else if (isTargetIOSBased()) CmdArgs.push_back("-iphoneos_version_min"); else { assert(isTargetMacOS() && "unexpected target"); |

