diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-26 09:07:58 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-26 09:07:58 +0100 |
| commit | 680f436de36aed41f87f4179637192f3cdfb021b (patch) | |
| tree | 38c2d78fff1e1ad15b0c2d66ba867ed86c1a3463 | |
| parent | c77bbe5516b478dda379a03b4a0f2f693e2ee3c5 (diff) | |
| download | ATCD-680f436de36aed41f87f4179637192f3cdfb021b.tar.gz | |
Default enable c++11 for macosx
* ACE/include/makeinclude/platform_macosx_common.GNU:
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_common.GNU | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index fe4e2c477c9..342883b2855 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -42,18 +42,10 @@ SOBUILD = -o $(VSHDIR)$*.dylib $< ifeq ($(findstring g++,$(CXX)),)# include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU else + c++11 ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU endif -ifneq ($(findstring g++,$(CXX)),) - CXX_MAJOR_VERSION := $(shell $(CXX) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') - # 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 -endif - LDFLAGS += -flat_namespace ifeq ($(universal),1) |