[Libreoffice-commits] .: Branch 'libreoffice-3-4' - openssl/makefile.mk

[Michael Meeks]

 openssl/makefile.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 8011a0a46b152d9baa80287cb7d78ec75678876f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 27 09:16:30 2011 +0100

    Related: fdo#35404 force .a files to hidden visibility
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index aff765f..d01785f 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -56,7 +56,15 @@ CONFIGURE_ACTION=config
 CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared no-idea
 
 BUILD_DIR=.
-BUILD_ACTION=make CC='$(CC)'
+
+COMPILER_AND_FLAGS=$(CC)
+#See fdo#35404 If we're only interested in getting a .a (i.e. not windows) then
+#force everything, when possible, as hidden symbols
+.IF "$(OS)" != "WNT" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+COMPILER_AND_FLAGS+=-fvisibility=hidden
+.ENDIF
+
+BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)'
 
 OUT2LIB = libssl.*
 OUT2LIB += libcrypto.*