Merge pull request #60975 from edymtt/set-sanitizer-osx-min-version-to-10.10

edymtt · web-flow · commit 1665778b3427 · 2022-09-08T01:46:05.000-07:00
Rely on macOS deployment target set by compiler-rt for sanitizers
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -735,7 +735,6 @@ function set_build_options_for_host() {
                 -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}"
                 -DLLVM_ENABLE_MODULES:BOOL="$(true_false ${LLVM_ENABLE_MODULES})"
                 -DCMAKE_OSX_ARCHITECTURES="${architecture}"
             )

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,6 @@ function set_build_options_for_host() {`
`735`	`735`	`-DCOMPILER_RT_ENABLE_IOS:BOOL=FALSE`
`736`	`736`	`-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE`
`737`	`737`	`-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE`
`738`		`- -DSANITIZER_MIN_OSX_VERSION="${cmake_osx_deployment_target}"`
`739`	`738`	`-DLLVM_ENABLE_MODULES:BOOL="$(true_false ${LLVM_ENABLE_MODULES})"`
`740`	`739`	`-DCMAKE_OSX_ARCHITECTURES="${architecture}"`
`741`	`740`	`)`