diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-12-01 13:40:52 +0100 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-11-30 09:09:03 -0600 |
| commit | f0e1da800fdb41eb0b71ef66e5bd561c013f2423 (patch) | |
| tree | 5d6a340515859da16bf9507b51446b1facc56f7a | |
| parent | 0edc31ef4f941748ca527033d0fb1f71ac805960 (diff) | |
| download | ATCD-f0e1da800fdb41eb0b71ef66e5bd561c013f2423.tar.gz | |
Merge pull request #1741 from iedutu/master
Support for macOS major version fallback
(cherry picked from commit 61da3abdcfc16295ed34ab552b35dce4f2b78bad)
# Conflicts:
# ACE/include/makeinclude/platform_macosx.GNU
# ACE/include/makeinclude/platform_macosx_monterey.GNU
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx.GNU | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 828943ffcf3..bf8f9fbd1c1 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -51,8 +51,8 @@ else ifeq ($(MACOS_MAJOR_VERSION),12) MACOS_CODENAME = $(MACOS_CODENAME_VER_12_latest) endif else - ## Unsupported major version - $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) + ## 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 |