diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-12-01 13:40:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-01 13:40:52 +0100 |
commit | 61da3abdcfc16295ed34ab552b35dce4f2b78bad (patch) | |
tree | e5b1ac7bd44d12bad94b7f5f2d4ff85293b3be49 | |
parent | c012b2e2c49137f56b84bae096aa4a93314d94b2 (diff) | |
parent | 5d5cf9581bfb7fb92df367ea326b18c5b71cc4e4 (diff) | |
download | ATCD-61da3abdcfc16295ed34ab552b35dce4f2b78bad.tar.gz |
Merge pull request #1741 from iedutu/master
Support for MacOS 10.12 Monterey - Intel build.
-rw-r--r-- | ACE/include/makeinclude/platform_macosx.GNU | 13 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_macosx_monterey.GNU | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 9aba3d6c0b9..ca08204574f 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 0; 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 -- will fallback to the last known version. + MACOS_CODENAME = $(MACOS_CODENAME_VER_12_latest) 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 + |