From 9740e05c8e2f2c906444bf6b4ae01dd24e39cf39 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 20 Feb 2023 16:28:53 +0100
Subject: Enable C++14 for clang 5/6/7/8

    * ACE/include/makeinclude/platform_linux_clang.GNU:
---
 ACE/include/makeinclude/platform_linux_clang.GNU | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU
index 1bc22c06a02..48a5e346241 100644
--- a/ACE/include/makeinclude/platform_linux_clang.GNU
+++ b/ACE/include/makeinclude/platform_linux_clang.GNU
@@ -18,10 +18,18 @@ else
 CXX_MAJOR_VERSION := $(shell $(CXX) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//')
 endif
 
-# clang5 has C++03 as default C++ version, enable this to be C++11
-# the older clang versions all return 4.2.1 as part of dumpversion
-ifeq ($(findstring $(CXX_MAJOR_VERSION),4),$(CXX_MAJOR_VERSION))
-  c++11 ?= 1
+# clang5/6/7/8 have C++11 as default C++ version, enable this to be C++14
+ifeq ($(findstring $(CXX_MAJOR_VERSION),5),$(CXX_MAJOR_VERSION))
+  c++14 ?= 1
+endif
+ifeq ($(findstring $(CXX_MAJOR_VERSION),6),$(CXX_MAJOR_VERSION))
+  c++14 ?= 1
+endif
+ifeq ($(findstring $(CXX_MAJOR_VERSION),7),$(CXX_MAJOR_VERSION))
+  c++14 ?= 1
+endif
+ifeq ($(findstring $(CXX_MAJOR_VERSION),8),$(CXX_MAJOR_VERSION))
+  c++14 ?= 1
 endif
 
 CCFLAGS += $(CFLAGS)
-- 
cgit v1.2.1