From 45d906762a7b25559d7d67b4f33e0ec6b42b5163 Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Fri, 4 Jan 2019 14:58:39 -0800 Subject: [PATCH 1/3] Specify the minimum supported version of macOS in configurecompiler.cmake --- configurecompiler.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configurecompiler.cmake b/configurecompiler.cmake index d3c91115e2d4..253fee60f4ae 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -475,6 +475,11 @@ 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) + add_compile_options(-mmacosx-version-min=10.12) + endif(CLR_CMAKE_PLATFORM_DARWIN) endif(CLR_CMAKE_PLATFORM_UNIX) if(CLR_CMAKE_PLATFORM_UNIX_ARM) From 6b078af46cbce3dd89a7f7594af92010fd7baedc Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Thu, 3 Jan 2019 15:07:11 -0800 Subject: [PATCH 2/3] Enable OSX.1012.Amd64.* queues and OSX.1014.Amd64 in eng/platform-matrix.yml --- eng/platform-matrix.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml index dc375d1fe8a5..10139f5afaa9 100644 --- a/eng/platform-matrix.yml +++ b/eng/platform-matrix.yml @@ -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 From 18f746d55fc2c51e56832ada13f8d17ea5e4898f Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Tue, 8 Jan 2019 10:01:08 -0800 Subject: [PATCH 3/3] Pass the minimum supported version of macOS to linker in configurecompiler.cmake --- configurecompiler.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configurecompiler.cmake b/configurecompiler.cmake index 253fee60f4ae..371e6e0a7cf1 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -478,7 +478,10 @@ if (CLR_CMAKE_PLATFORM_UNIX) # Specify the minimum supported version of macOS if(CLR_CMAKE_PLATFORM_DARWIN) - add_compile_options(-mmacosx-version-min=10.12) + 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)