summaryrefslogtreecommitdiff
path: root/include/makeinclude
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-02-10 11:10:35 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-02-10 11:10:35 +0000
commit326c845d42415ee6e2b247e852c8ab48b19bf4f9 (patch)
treef4a94585589352800524829a36d9ff377a835716 /include/makeinclude
parent968fbcdc2937529f58d61ba51a1bde754ee52f2d (diff)
downloadATCD-326c845d42415ee6e2b247e852c8ab48b19bf4f9.tar.gz
ChangeLogTag: Fri Feb 10 10:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'include/makeinclude')
-rw-r--r--include/makeinclude/platform_linux_icc.GNU9
-rw-r--r--include/makeinclude/wrapper_macros.GNU4
2 files changed, 10 insertions, 3 deletions
diff --git a/include/makeinclude/platform_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU
index 55945eac5ab..b11cd63fece 100644
--- a/include/makeinclude/platform_linux_icc.GNU
+++ b/include/makeinclude/platform_linux_icc.GNU
@@ -7,7 +7,7 @@
exceptions ?= 1
debug ?= 1
-optimize ?= 0
+optimize ?= 1
threads ?= 1
PLATFORM_XT_CPPFLAGS=
@@ -131,9 +131,16 @@ PRELIB = @true
ifeq ($(shared_libs), 1)
ifneq ($static_libs_only), 1)
LDFLAGS += -Wl,-E
+
+ ifneq ($(no_hidden_visibility),1)
+ CCFLAGS += -fvisibility=hidden
+ else
+ CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+ endif # no_hidden_visibility
endif
endif
+
# Added line below to support "Executable Shared Object" files (as
# needed by the service configurator).
# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index cfda7a0e706..718a65a52ca 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -287,10 +287,10 @@ ifeq ($(threads),0)
endif # threads
####
-#### Defaults are exceptions off (0), fast off (0), rtti on (1), and
+#### Defaults are exceptions on (1), fast off (0), rtti on (1), and
#### versioned_so on (1).
####
-exceptions ?= 0
+exceptions ?= 1
fast ?= 0