Driver/Darwin: Fix a crash when diagnosing conflicting deployment targets.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94812 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 19f9012a42e955a1044f06cd5225d9df279c0f31..7179ba3c1ea4b5236d1c7c6d1294cfbb4e7e1c0e 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -385,10 +385,12 @@ DerivedArgList *Darwin::TranslateArgs(InputArgList &Args,
     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);