summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-09-11 04:40:20 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-09-11 04:40:20 +0000
commitba31a65852b32da8b46cbaa005bdf55c023d8d27 (patch)
treee9802ca7f7cd1f361b549f6a5940546c62806570
parent24b51645213460c6bc141f9a15eb6ff3dc33529b (diff)
downloadATCD-ba31a65852b32da8b46cbaa005bdf55c023d8d27.tar.gz
Sun Sep 10 09:23:04 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/include/makeinclude/platform_g++_common.GNU14
2 files changed, 21 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 900173041bb..6648c869193 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Sun Sep 10 09:23:04 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * include/makeinclude/platform_g++_common.GNU
+
+ Committing a fix provided by Ossama Othman (Ossama_Othman at symantec dot com)
+ to fix a problem with symbol visibility when building static libraries.
+
Fri Sep 8 21:11:20 UTC 2006 Steve Huston <shuston@riverace.com>
* ace/CDR_Stream.cpp (ACE_OutputCDR::replace()): Fixed compile error
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index 6fa030aea78..7b4dbba3457 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -100,5 +100,19 @@ ifeq ($(shared_libs), 1)
CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
endif # no_hidden_visibility
endif # GXX_4_OR_BETTER == 1
+ else
+ # Explicitly disable G++ (>= 4.x) visibility attributes since
+ # they are only meant for use when building shared libraries.
+ ifeq ($(GXX_4_OR_BETTER), 1)
+ no_hidden_visibility = 1
+ CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+ endif # GXX_4_OR_BETTER == 1
endif # static_libs_only
+else
+ # Explicitly disable G++ (>= 4.x) visibility attributes since
+ # they are only meant for use when building shared libraries.
+ ifeq ($(GXX_4_OR_BETTER), 1)
+ no_hidden_visibility = 1
+ CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
+ endif # GXX_4_OR_BETTER == 1
endif # shared_libs