From e66d46e38a26f3113edd07241337205e9842cf40 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 18 Nov 2021 15:03:57 +0100 Subject: Fallback to MacOSX 11 latest when we have a not recognized major version * ACE/include/makeinclude/platform_macosx.GNU: * TAO/NEWS: --- ACE/include/makeinclude/platform_macosx.GNU | 5 +++-- TAO/NEWS | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 056acd08ee8..9aba3d6c0b9 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -43,8 +43,9 @@ else ifeq ($(MACOS_MAJOR_VERSION),11) MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest) endif else - ## Unsupported major version - $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION)) + ## 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 include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU diff --git a/TAO/NEWS b/TAO/NEWS index e115265675f..828db22f3e6 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -5,7 +5,7 @@ USER VISIBLE CHANGES BETWEEN TAO-3.0.4 and TAO-3.0.5 ==================================================== . TAO_IDL: Fix bug where floating point constant expressions fail to evaluate. - This bug was introduced in 3.0.3. + This bug was introduced in 3.0.3 USER VISIBLE CHANGES BETWEEN TAO-3.0.3 and TAO-3.0.4 ==================================================== -- cgit v1.2.1