From 183f781cd689802874e9f56f10b3e5591b0914a7 Mon Sep 17 00:00:00 2001 From: Cristian Ungureanu Date: Mon, 29 Nov 2021 15:20:04 +0200 Subject: Support for MacOS 10.12 Monterey - Intel build. --- ACE/include/makeinclude/platform_macosx.GNU | 13 ++++++++++--- ACE/include/makeinclude/platform_macosx_monterey.GNU | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 ACE/include/makeinclude/platform_macosx_monterey.GNU diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 9aba3d6c0b9..c957969dddc 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -24,6 +24,8 @@ MACOS_CODENAME_VER_11_0 := bigsur MACOS_CODENAME_VER_11_1 := bigsur MACOS_CODENAME_VER_11_2 := bigsur MACOS_CODENAME_VER_11_latest := bigsur +MACOS_CODENAME_VER_12_0 := monterey +MACOS_CODENAME_VER_12_latest := monterey MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) @@ -42,10 +44,15 @@ else ifeq ($(MACOS_MAJOR_VERSION),11) ## just use the latest known version MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest) endif +else ifeq ($(MACOS_MAJOR_VERSION),12) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 2; echo $$?),0) + ## if the detected version is greater than the latest know version, + ## just use the latest known version + MACOS_CODENAME = $(MACOS_CODENAME_VER_12_latest) + endif else - ## if the detected version is greater than the latest know version, - ## just use the latest known version - MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest) + ## Unsupported major version + $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) endif include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU diff --git a/ACE/include/makeinclude/platform_macosx_monterey.GNU b/ACE/include/makeinclude/platform_macosx_monterey.GNU new file mode 100644 index 00000000000..6ec0ad0d5fe --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_monterey.GNU @@ -0,0 +1,2 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_bigsur.GNU + -- cgit v1.2.1