summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDouglas Mencken <dougmencken@gmail.com>2013-12-30 10:55:47 -0500
committerCaolán McNamara <caolanm@redhat.com>2014-01-20 15:05:24 +0000
commit8ae8d5165c29cb899e6a8a57d1021a844ac30b30 (patch)
tree9c9dccbde8d15c4b415069da19b872a7af48a9e5 /external
parentd33b4c311e3b9c0b8f50080cb38a31c19f587a16 (diff)
Get bundled openssl to be used on OS X too, at least on OS X <10.7
Also note that OpenSSL is incompatible with -fvisibility=hidden on OS X Change-Id: I1fc3cf4d515ef210f996cb04ba9c1b3216109137 Reviewed-on: https://gerrit.libreoffice.org/7233 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/openssl/ExternalProject_openssl.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index 919e354f6d7f..d04c1867675d 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -83,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
$(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& $(MAKE) build_libs \
- CC="$(CC) -fPIC $(if $(filter-out WNT,$(OS)),\
+ CC="$(CC) -fPIC $(if $(filter-out WNT MACOSX,$(OS)),\
$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
-fvisibility=hidden))" \
)