summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/platform_linux_icc.GNU
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/include/makeinclude/platform_linux_icc.GNU')
-rw-r--r--ACE/include/makeinclude/platform_linux_icc.GNU9
1 files changed, 7 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_linux_icc.GNU b/ACE/include/makeinclude/platform_linux_icc.GNU
index 1afd19c729f..adee04d31d3 100644
--- a/ACE/include/makeinclude/platform_linux_icc.GNU
+++ b/ACE/include/makeinclude/platform_linux_icc.GNU
@@ -39,6 +39,10 @@ endif
ifeq (11.0,$(findstring 11.0,$(CXX_VERSION)))
CFLAGS += -wd1684
endif
+ifeq (12.0,$(findstring 12.0,$(CXX_VERSION)))
+ CPPFLAGS += -std=c++0x
+ no_hidden_visibility ?= 0
+endif
no_hidden_visibility ?= 1
@@ -54,12 +58,13 @@ ifeq ($(ipo),1)
CPPFLAGS += -ipo
endif
+
CFLAGS += -w1
ifeq ($(threads),1)
CPPFLAGS += -D_REENTRANT $(PLATFORM_AIO_SUPPORT)
endif # threads
-CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) -ip
+CCFLAGS += $(CFLAGS) -ip
DCFLAGS += -g -debug full
DLD = $(CXX)
LD = $(CXX)
@@ -94,7 +99,7 @@ ifeq ($(shared_libs), 1)
ifneq ($static_libs_only), 1)
LDFLAGS += -Wl,-E
ifneq ($(no_hidden_visibility),1)
- CCFLAGS += -fvisibility=hidden
+ CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
else
CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
endif # no_hidden_visibility