diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-04-23 21:35:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-23 21:35:01 +0200 |
| commit | 6b2749bef34f4882a96dccc4c53a288a2d4d04d5 (patch) | |
| tree | 6c4bee919acba9d8fece305f71365fde7c1916ee /ACE | |
| parent | b2a31c772e0f2fcb2113646d10a17a0d2e9e36db (diff) | |
| parent | c589fbcb36576f48efaacb65828223f8c1bdd202 (diff) | |
| download | ATCD-6b2749bef34f4882a96dccc4c53a288a2d4d04d5.tar.gz | |
Merge pull request #1478 from jwillemsen/jwi-macosxbigsur
MacOSX 11.1/11.2 are both bigsur releases
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx.GNU | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 697967fd794..056acd08ee8 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -6,7 +6,6 @@ MACOS_MAJOR_VERSION = $(word 1,${MACOS_REL_WORDS}) MACOS_MINOR_VERSION = $(word 2,${MACOS_REL_WORDS}) MACOS_BUILD_VERSION = $(word 3,${MACOS_REL_WORDS}) - MACOS_CODENAME_VER_10_2 := MACOS_CODENAME_VER_10_3 := panther MACOS_CODENAME_VER_10_4 := tiger @@ -22,6 +21,8 @@ MACOS_CODENAME_VER_10_13 := highsierra MACOS_CODENAME_VER_10_14 := mojave MACOS_CODENAME_VER_10_latest := mojave 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 = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) @@ -36,7 +37,7 @@ ifeq ($(MACOS_MAJOR_VERSION),10) $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) endif else ifeq ($(MACOS_MAJOR_VERSION),11) - ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 0; echo $$?),0) + 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_11_latest) |