Make sure that the sanitizers use the same minimum OS X deployment target as llvm/clang/swift.

gottesmm · gottesmm · commit 3b7639defdfc · 2016-05-13T22:05:01.000-07:00
Otherwise, we run into an issue with certain clangs and linking in libc++. libc++ in certain clangs require a minimum deployment target of at least 10.7. I have not investigated further since I am trying to make progress on the branching scheme. rdar://26081474 (cherry picked from commit 2a27443)
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -531,6 +531,7 @@ function set_deployment_target_based_options() {
                 -DCOMPILER_RT_ENABLE_IOS:BOOL=FALSE
                 -DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
                 -DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
+                -DSANITIZER_MIN_OSX_VERSION="${cmake_osx_deployment_target}"
             )
             if [[ $(true_false "${LLVM_ENABLE_LTO}") = "TRUE" ]]; then
                 if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then

Original file line number	Diff line number	Diff line change
`@@ -531,6 +531,7 @@ function set_deployment_target_based_options() {`
`531`	`531`	`-DCOMPILER_RT_ENABLE_IOS:BOOL=FALSE`
`532`	`532`	`-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE`
`533`	`533`	`-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE`
	`534`	`+ -DSANITIZER_MIN_OSX_VERSION="${cmake_osx_deployment_target}"`
`534`	`535`	`)`
`535`	`536`	`if [[ $(true_false "${LLVM_ENABLE_LTO}") = "TRUE" ]]; then`
`536`	`537`	`if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then`