diff options
Diffstat (limited to 'ACE/include')
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_clang.GNU | 10 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_common.GNU | 2 |
2 files changed, 5 insertions, 7 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 diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 342883b2855..315521a7f8f 100644 --- 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++11 ?= 1 + c++14 ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU endif |