Skip to content

Commit 77bdad5

Browse files
authored
Bump to macOS 10.14 minimum in libs and mono builds too (#63682)
#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.
1 parent 01cdd1d commit 77bdad5

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/mono/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<tvOSVersionMin>10.0</tvOSVersionMin>
1818
<watchOSVersionMin>2.0</watchOSVersionMin>
1919
<watchOS64_32VersionMin>5.1</watchOS64_32VersionMin>
20-
<macOSVersionMin>10.13</macOSVersionMin>
20+
<macOSVersionMin>10.14</macOSVersionMin>
2121
<!-- FIXME: when we're building ios or tvOS cross-compilers hosted on OSX/arm64 targeting ios/arm64 we should set the min macOS version to 11.0, also -->
2222
<macOSVersionMin Condition="('$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'MacCatalyst') and '$(TargetArchitecture)' == 'arm64'">11.0</macOSVersionMin>
2323

src/native/libs/build-native.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,7 @@ else
7070
fi
7171
fi
7272

73-
if [[ "$__TargetOS" == OSX ]]; then
74-
# set default OSX deployment target
75-
if [[ "$__BuildArch" == x64 ]]; then
76-
__CMakeArgs="-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 $__CMakeArgs"
77-
else
78-
__CMakeArgs="-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 $__CMakeArgs"
79-
fi
80-
elif [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then
73+
if [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then
8174
# Android SDK defaults to c++_static; we only need C support
8275
__CMakeArgs="-DANDROID_STL=none $__CMakeArgs"
8376
elif [[ "$__TargetOS" == iOSSimulator ]]; then

0 commit comments

Comments
 (0)