Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Specify the minimum supported version of macOS #21816

Merged
merged 3 commits into from
Jan 9, 2019
Merged

Specify the minimum supported version of macOS #21816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45d9067
Specify the minimum supported version of macOS in configurecompiler.c…
echesakov Jan 4, 2019
6b078af
Enable OSX.1012.Amd64.* queues and OSX.1014.Amd64 in eng/platform-mat…
echesakov Jan 3, 2019
18f746d
Pass the minimum supported version of macOS to linker in configurecom…
echesakov Jan 8, 2019
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
8 changes: 8 additions & 0 deletions configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,14 @@ if (CLR_CMAKE_PLATFORM_UNIX)
# Some architectures (e.g., ARM) assume char type is unsigned while CoreCLR assumes char is signed
# as x64 does. It has been causing issues in ARM (https://github.com/dotnet/coreclr/issues/4746)
add_compile_options(-fsigned-char)

# Specify the minimum supported version of macOS
if(CLR_CMAKE_PLATFORM_DARWIN)
set(MACOS_VERSION_MIN_FLAGS "-mmacosx-version-min=10.12")
add_compile_options("${MACOS_VERSION_MIN_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MACOS_VERSION_MIN_FLAGS}")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MACOS_VERSION_MIN_FLAGS}")
endif(CLR_CMAKE_PLATFORM_DARWIN)
endif(CLR_CMAKE_PLATFORM_UNIX)

if(CLR_CMAKE_PLATFORM_UNIX_ARM)
Expand Down
5 changes: 2 additions & 3 deletions eng/platform-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,8 @@ jobs:
archType: x64
osGroup: OSX
osIdentifier: OSX
# TODO: add OSX.1012.Amd64.Open and OSX.1012.Amd64 when https://github.com/dotnet/core-eng/issues/4856 is resolved
helixQueuesPublic: 'OSX.1013.Amd64.Open'
helixQueuesInternal: 'OSX.1013.Amd64'
helixQueuesPublic: 'OSX.1012.Amd64.Open,OSX.1013.Amd64.Open'
helixQueuesInternal: 'OSX.1012.Amd64,OSX.1013.Amd64,OSX.1014.Amd64'
${{ insert }}: ${{ parameters.jobParameters }}

# Windows x64/x86/arm/arm64
Expand Down