diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-22 13:32:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-22 13:32:35 +0100 |
| commit | 4ea44f59178bba284ec90eea7352ce95ecd3ee6a (patch) | |
| tree | cb70c0bb344cb9412e9a8d1217cf1831019ae484 /ACE/include/makeinclude/platform_linux_clang.GNU | |
| parent | 54406e2ff1e39a3245d04253648153d5f4751938 (diff) | |
| parent | 606a42cd58a161c971723d10713699d922530a28 (diff) | |
| download | ATCD-4ea44f59178bba284ec90eea7352ce95ecd3ee6a.tar.gz | |
Merge pull request #2052 from jwillemsen/jwi-gcc14
ACE/TAO now require C++14 or newer
Diffstat (limited to 'ACE/include/makeinclude/platform_linux_clang.GNU')
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_clang.GNU | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 2cfc0accbec..a0fed4aa604 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -18,12 +18,6 @@ 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 -endif - CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) @@ -45,6 +39,10 @@ ifeq ($(c++11),1) CCFLAGS += -std=c++11 endif +ifeq ($(c++14),1) + CCFLAGS += -std=c++14 +endif + ifeq ($(no_deprecated),1) CCFLAGS += -Wno-deprecated-declarations endif |