[cfe-commits] r94812 - /cfe/trunk/lib/Driver/ToolChains.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jan 29 11:02:25 2010
New Revision: 94812

URL: http://llvm.org/viewvc/llvm-project?rev=94812&view=rev
Log:
Driver/Darwin: Fix a crash when diagnosing conflicting deployment targets.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=94812&r1=94811&r2=94812&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Fri Jan 29 11:02:25 2010
@@ -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);