summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/platform_macosx_common.GNU
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2023-02-22 13:32:52 +0100
committerGitHub <noreply@github.com>2023-02-22 13:32:52 +0100
commit3827363c2dfe94345cab759b5b968eeec89205b4 (patch)
treefd7f6e8f8bfa6e7d00a607e0421122b9a788ab1a /ACE/include/makeinclude/platform_macosx_common.GNU
parentc5b4f7009b47eac331fb5d20d53366fc99abecf0 (diff)
parent4ea44f59178bba284ec90eea7352ce95ecd3ee6a (diff)
downloadATCD-3827363c2dfe94345cab759b5b968eeec89205b4.tar.gz
Merge branch 'master' into master
Diffstat (limited to 'ACE/include/makeinclude/platform_macosx_common.GNU')
-rw-r--r--ACE/include/makeinclude/platform_macosx_common.GNU2
1 files changed, 1 insertions, 1 deletions
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