From 4637db4161be645eb73aae66eeb7cdf98853bca7 Mon Sep 17 00:00:00 2001 From: "Justin R. Wilson" Date: Thu, 26 May 2022 14:21:46 -0500 Subject: [PATCH] Add support for macOS Monterey --- ACE/include/makeinclude/platform_macosx.GNU | 8 ++++++++ ACE/include/makeinclude/platform_macosx_monterey.GNU | 1 + 2 files changed, 9 insertions(+) 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 0e2d18e20e5..828943ffcf3 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -24,6 +24,8 @@ MACOS_CODENAME_VER_10_15 := catalina MACOS_CODENAME_VER_10_latest := catalina MACOS_CODENAME_VER_11_5 := bigsur MACOS_CODENAME_VER_11_latest := bigsur +MACOS_CODENAME_VER_12_3 := monterey +MACOS_CODENAME_VER_12_latest := monterey MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) @@ -42,6 +44,12 @@ 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 3; 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 ## Unsupported major version $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) diff --git a/ACE/include/makeinclude/platform_macosx_monterey.GNU b/ACE/include/makeinclude/platform_macosx_monterey.GNU new file mode 100644 index 00000000000..b40a6950b5b --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_monterey.GNU @@ -0,0 +1 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_bigsur.GNU -- 2.11.4.GIT