Changes for clang default C++ compiler level

* .github/workflows/linux.yml: * ACE/include/makeinclude/platform_linux_clang.GNU: * ACE/include/makeinclude/platform_macosx_common.GNU:
jwillemsen · Apr 23, 2024 · 5efddd5 · 5efddd5
1 parent 0655b61
commit 5efddd5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -120,6 +120,12 @@ jobs:
             Repo: llvm-toolchain-$(lsb_release -cs)-15
             platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
             os: ubuntu-22.04
+          - CC: clang-16
+            CXX: clang++-16
+            PackageDeps: clang-16
+            Repo: llvm-toolchain-$(lsb_release -cs)-16
+            platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
+            os: ubuntu-22.04
           - feature: CORBA/e micro
             CC: gcc-10
             CXX: g++-10

diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU
@@ -18,6 +18,11 @@ else
 CXX_MAJOR_VERSION := $(shell $(CXX) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//')
 endif
 
+# clang 16 and newer default to C++17
+ifeq ($(CXX_MAJOR_VERSION),$(filter $(CXX_MAJOR_VERSION),6 7 8 9 10 11 12 13 14 15))
+  c++std ?= c++17
+endif
+
 CCFLAGS += $(CFLAGS)
 DCFLAGS += -g
 DLD     = $(CXX)
@@ -35,6 +40,14 @@ ifeq ($(optimize),0)
   CPPFLAGS += -O0
 endif
 
+ifeq ($(CXX_MAJOR_VERSION),7)
+  c++std ?= c++17
+endif
+
+ifneq ($(c++std),)
+  CCFLAGS += -std=$(c++std)
+endif
+
 ifeq ($(c++20),1)
   CCFLAGS += -std=c++20
 endif

diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU
@@ -42,7 +42,7 @@ SOBUILD   = -o $(VSHDIR)$*.dylib $<
 ifeq ($(findstring g++,$(CXX)),)#
   include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
 else
-  c++17 ?= 1
+  c++std ?= c++17
   include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU
 endif