diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-01-29 17:02:25 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-01-29 17:02:25 +0000 |
| commit | 6596984f3cc11ed41dcfc34c8f825f727dc1c3a3 (patch) | |
| tree | bcf746e33d831227133428237a6027ea570854a2 /clang/lib/Driver/ToolChains.cpp | |
| parent | 16810ca647b99393ebb6141fa079b78ac883f23e (diff) | |
| download | bcm5719-llvm-6596984f3cc11ed41dcfc34c8f825f727dc1c3a3.tar.gz bcm5719-llvm-6596984f3cc11ed41dcfc34c8f825f727dc1c3a3.zip | |
Driver/Darwin: Fix a crash when diagnosing conflicting deployment targets.
llvm-svn: 94812
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 19f9012a42e..7179ba3c1ea 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/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); |
