summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-05-10 14:41:53 +0300
committerTor Lillqvist <tml@iki.fi>2013-05-10 18:56:46 +0300
commit76d098a07bb2f901948d39522954dff6b50adae8 (patch)
tree575c4f98550ab9b88ab62ee3234bc9742f32624d /openssl
parent88143d96a06b4d83cdad4f6b66195c10640761b7 (diff)
Enable building OpenSSL for OS X
Note that this doesn't imply it *will* be built; that depends on configury options and changes to configure.ac. Change-Id: I5ed531bc8999f49b9e696523226454f99f253882
Diffstat (limited to 'openssl')
-rw-r--r--openssl/ExternalProject_openssl.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index 66373ba0fa3a..87397fe9715c 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -49,6 +49,10 @@ OPENSSL_PLATFORM := \
,\
$(if $(filter I,$(CPU)),VC-WIN32,VC-WIN64A)\
)\
+ ,\
+ $(if $(filter MACOSX,$(OS)),\
+ $(if $(filter I,$(CPU)),darwin-i386-cc,darwin64-x86_64-cc)\
+ )\
)\
)\
)\
@@ -70,7 +74,7 @@ else
$(call gb_ExternalProject_get_state_target,openssl,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
- && $(if $(filter LINUX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\
+ && $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\
$(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \
$(OPENSSL_PLATFORM) \
$(if $(filter ANDROID,$(OS)),\