summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-11-18 19:36:51 +0100
committerGitHub <noreply@github.com>2021-11-18 19:36:51 +0100
commitebf6d0f0b1248bf22f310301796a98abbdfc0f76 (patch)
tree37db78bf43069b7088e6350ff9ca3057c52a7ae2
parent63e6666ef111605b4d7eff027aaa3092f2466444 (diff)
parente66d46e38a26f3113edd07241337205e9842cf40 (diff)
downloadATCD-ebf6d0f0b1248bf22f310301796a98abbdfc0f76.tar.gz
Merge pull request #1737 from jwillemsen/jwi-macosfallback
Fallback to MacOSX 11 latest when we have a not recognized major version
-rw-r--r--ACE/include/makeinclude/platform_macosx.GNU5
-rw-r--r--TAO/NEWS2
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
====================================================