diff options
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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); |