diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-12-10 16:57:36 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-07 10:57:02 +0200 |
| commit | 59903419ab177402cc394e282bf24cf05f8f3441 (patch) | |
| tree | 37161c7690492595a2df7dcb9ce8ba29a08c7bfb /external | |
| parent | 89f9c38dac55966cd51587176b3bb7e0e5867f3d (diff) | |
Add --with-prebuilt-openssl
Don't ask.
Oh well, if you want to know: For some people, like me, Cygwin and its
Perl run into horrible trouble with the fork() emulation when building
OpenSSL. (But my Cygwin works fine for all else in the build. Go
figure.)
So I came up with a way to use prebuilt OpenSSL binaries. Not to be
used for release builds, of course (and the configury checks for
that), as long as our policy is to build all we can from sources.
Change-Id: Ic303bdf0c620c5122aca3d646fa1f0587221e70f
(cherry picked from commit cf029192e4ac9ce0e24ddfd880f5f9d557cf9c28)
Diffstat (limited to 'external')
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index ea5f8b22b1c8..c22ec7bfc417 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -60,6 +60,8 @@ OPENSSL_PLATFORM := \ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,openssl,build): + $(if $(filter PREBUILT_OPENSSL,$(BUILD_TYPE)),\ + cd $(BUILDDIR) && $(GNUTAR) -x -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(PREBUILT_OPENSSL_TARBALL),\ $(call gb_ExternalProject_run,build,\ export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ && export PERL="$(shell cygpath -w $(PERL))" \ @@ -68,7 +70,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): && cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \ && unset MAKEFLAGS \ && nmake -f "ms\ntdll.mak" \ - ) + )) else $(call gb_ExternalProject_get_state_target,openssl,build): |