From: Daniel Dunbar Date: Fri, 29 Jan 2010 17:02:25 +0000 (+0000) Subject: Driver/Darwin: Fix a crash when diagnosing conflicting deployment targets. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a3c1d9dcfdb199353b68b071b6319724b8e3c31;p=clang 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 19f9012a42..7179ba3c1e 100644 --- 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);