diff options
| author | Justin R. Wilson <wilsonj@objectcomputing.com> | 2021-08-20 11:00:40 -0500 |
|---|---|---|
| committer | Justin R. Wilson <wilsonj@objectcomputing.com> | 2021-08-20 11:26:00 -0500 |
| commit | f416adcbdc76f096ae34bb984a50c1070e957701 (patch) | |
| tree | 0a7d1208b5c3d2a9344168a0bf112ffd349dc46a | |
| parent | 648d530d787acf85b9b85f0e30f3ed114ff10294 (diff) | |
| download | ATCD-f416adcbdc76f096ae34bb984a50c1070e957701.tar.gz | |
ACE 6 doesn't support Big Sur
Problem
-------
ACE 6 doesn't compile for macOS Big Sur.
Solution
--------
Update platform_macosx.GNU and related files to support Catalina and
Big Sur.
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx.GNU | 15 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_bigsur.GNU | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_catalina.GNU | 1 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index f318adace60..0e2d18e20e5 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -20,19 +20,28 @@ MACOS_CODENAME_VER_10_11 := elcapitan MACOS_CODENAME_VER_10_12 := sierra MACOS_CODENAME_VER_10_13 := highsierra MACOS_CODENAME_VER_10_14 := mojave -MACOS_CODENAME_VER_latest := mojave +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 = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) ifeq ($(MACOS_MAJOR_VERSION),10) - ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 14; echo $$?),0) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 15; echo $$?),0) ## if the detected version is greater than the latest know version, ## just use the latest known version - MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) + MACOS_CODENAME = $(MACOS_CODENAME_VER_10_latest) else ifeq ($(shell test $(MACOS_MINOR_VERSION) -lt 2; echo $$?),0) ## Unsupported minor version $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) endif +else ifeq ($(MACOS_MAJOR_VERSION),11) + 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) + endif else ## Unsupported major version $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) diff --git a/ACE/include/makeinclude/platform_macosx_bigsur.GNU b/ACE/include/makeinclude/platform_macosx_bigsur.GNU new file mode 100644 index 00000000000..6da5a8c610b --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_bigsur.GNU @@ -0,0 +1 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_catalina.GNU diff --git a/ACE/include/makeinclude/platform_macosx_catalina.GNU b/ACE/include/makeinclude/platform_macosx_catalina.GNU new file mode 100644 index 00000000000..d3f430d9c7f --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_catalina.GNU @@ -0,0 +1 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_mojave.GNU |