From 76d098a07bb2f901948d39522954dff6b50adae8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 10 May 2013 14:41:53 +0300 Subject: 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 --- openssl/ExternalProject_openssl.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'openssl') 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)),\ -- cgit