From 9352b5df0175e4bb2781fcf0a2949153c4d2d2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 12 Jan 2022 15:26:43 +0100 Subject: [PATCH] Bump to macOS 10.14 minimum in libs and mono builds too https://github.com/dotnet/runtime/pull/62822 bumped the minimum CMAKE_OSX_DEPLOYMENT_TARGET to 10.14, but the libs.native and mono parts of the build still used the old 10.13 value. In build-native.sh for libs.native we can actually remove the explicit setting since we're already setting it in eng/native/configurecompiler.cmake. --- src/mono/Directory.Build.props | 2 +- src/native/libs/build-native.sh | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index 64cbb38bceab80..0ab0f8ac2a557c 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -17,7 +17,7 @@ 10.0 2.0 5.1 - 10.13 + 10.14 11.0 diff --git a/src/native/libs/build-native.sh b/src/native/libs/build-native.sh index d40399da0e12d7..04e5ab7d62cd9b 100755 --- a/src/native/libs/build-native.sh +++ b/src/native/libs/build-native.sh @@ -70,14 +70,7 @@ else fi fi -if [[ "$__TargetOS" == OSX ]]; then - # set default OSX deployment target - if [[ "$__BuildArch" == x64 ]]; then - __CMakeArgs="-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 $__CMakeArgs" - else - __CMakeArgs="-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 $__CMakeArgs" - fi -elif [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then +if [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then # Android SDK defaults to c++_static; we only need C support __CMakeArgs="-DANDROID_STL=none $__CMakeArgs" elif [[ "$__TargetOS" == iOSSimulator ]]; then