2 files changed, 12 insertions, 3 deletions
diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU
index f318adace60..697967fd794 100644
--- a/ACE/include/makeinclude/platform_macosx.GNU
+++ b/ACE/include/makeinclude/platform_macosx.GNU
@@ -20,7 +20,9 @@ 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_latest := mojave
+MACOS_CODENAME_VER_11_0   := bigsur
+MACOS_CODENAME_VER_11_latest := bigsur
 
 MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION))
 
@@ -28,15 +30,20 @@ ifeq ($(MACOS_MAJOR_VERSION),10)
   ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 14; 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 0; 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))
 endif
 
 include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU
-
diff --git a/ACE/include/makeinclude/platform_macosx_bigsur.GNU b/ACE/include/makeinclude/platform_macosx_bigsur.GNU
new file mode 100644
index 00000000000..c8e8ef86ea5
--- /dev/null
+++ b/ACE/include/makeinclude/platform_macosx_bigsur.GNU
@@ -0,0 +1,2 @@
+include $(ACE_ROOT)/include/makeinclude/platform_macosx_mojave.GNU
+