summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2015-04-11 13:53:17 -0500
committerCaolán McNamara <caolanm@redhat.com>2015-04-11 20:22:00 +0000
commit199891f4ee16bc175727552fc7971c60b3c9a303 (patch)
tree0fb45ee8467f32cb29df0d7470732ef57aa121ec
parent14d57bc434ae79c481717430a7c3620c5fc35893 (diff)
openssl build breakage on MacOSX 10.6
3217bae01e58e7fe6f075514cf8d2baf89e76afe changed the apply of openssllnx.patch to make it unconditinal which introduce a -Wa, option that is not supported by the 10.6SDK Change-Id: Ic9f68bad5c7d0694d206bc4d6899ab01009942c0 Reviewed-on: https://gerrit.libreoffice.org/15253 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--external/openssl/UnpackedTarball_openssl.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk
index 0dbd470df6ab..b76908265c10 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -91,7 +91,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
))
$(eval $(call gb_UnpackedTarball_add_patches,openssl,\
- external/openssl/openssllnx.patch \
+ $(if $(filter MACOSX1060,$(OS)$(MACOSX_SDK_VERSION)),,external/openssl/openssllnx.patch) \
external/openssl/opensslmingw.patch \
external/openssl/opensslwnt.patch \
external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 \