Skip to content

Bump to macOS 10.14 minimum in libs and mono builds too #63682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 1 commit into from
Jan 13, 2022
Merged

Bump to macOS 10.14 minimum in libs and mono builds too #63682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Bump to macOS 10.14 minimum in libs and mono builds too 
#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.
  • Loading branch information
@akoeplinger
akoeplinger committed Jan 12, 2022
commit 9352b5df0175e4bb2781fcf0a2949153c4d2d2eb
2 changes: 1 addition & 1 deletion src/mono/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<tvOSVersionMin>10.0</tvOSVersionMin>
<watchOSVersionMin>2.0</watchOSVersionMin>
<watchOS64_32VersionMin>5.1</watchOS64_32VersionMin>
<macOSVersionMin>10.13</macOSVersionMin>
<macOSVersionMin>10.14</macOSVersionMin>
<!-- 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 -->
<macOSVersionMin Condition="('$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'MacCatalyst') and '$(TargetArchitecture)' == 'arm64'">11.0</macOSVersionMin>

Expand Down
9 changes: 1 addition & 8 deletions src/native/libs/build-native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

@kasperk81 kasperk81 Jan 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we delete all occurrences of CMAKE_OSX_DEPLOYMENT_TARGET from this file?

$ git grep -n CMAKE_OSX_DEPLOYMENT_TARGET :/src/native
src/native/libs/build-native.sh:76:        __CMakeArgs="-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 $__CMakeArgs"
src/native/libs/build-native.sh:78:        __CMakeArgs="-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 $__CMakeArgs"
src/native/libs/build-native.sh:86:    __CMakeArgs="-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 $__CMakeArgs"
src/native/libs/build-native.sh:100:    __CMakeArgs="-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 $__CMakeArgs"
src/native/libs/build-native.sh:112:    __CMakeArgs="-DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 $__CMakeArgs"
src/native/libs/build-native.sh:124:    __CMakeArgs="-DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvos -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 $__CMakeArgs"

Copy link
Member Author

@akoeplinger akoeplinger Jan 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, the ones from L86-124 are for iOS/tvOS and are still needed. we could move them to configurecompiler.cmake though, I'll look at that for a separate PR.

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
Expand Down