Driver/Darwin: Fix a crash when diagnosing conflicting deployment targets.
llvm-svn: 94812
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 19f9012..7179ba3 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -385,10 +385,12 @@
if (iPhoneOSTarget && iPhoneOSTarget[0] == '\0')
iPhoneOSTarget = 0;
- if (OSXTarget && iPhoneOSTarget) {
- getDriver().Diag(clang::diag::err_drv_conflicting_deployment_targets)
- << OSXTarget << iPhoneOSTarget;
- } else if (OSXTarget) {
+ if (OSXTarget) {
+ // Diagnose conflicting deployment targets.
+ if (iPhoneOSTarget)
+ getDriver().Diag(clang::diag::err_drv_conflicting_deployment_targets)
+ << OSXTarget << iPhoneOSTarget;
+
const Option *O = Opts.getOption(options::OPT_mmacosx_version_min_EQ);
OSXVersion = DAL->MakeJoinedArg(0, O, OSXTarget);
DAL->append(OSXVersion);