diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-03-09 12:24:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-03-09 12:32:31 +0200 |
| commit | b04a27ad6fa1088cc6887ccadab3165c43dfab02 (patch) | |
| tree | 68abc49feca6357acda2ed832a829145381a8ab0 /external/openssl | |
| parent | a1a63373f99a50eb0db0d8474e36278541d7c5cc (diff) | |
Revert "Add --with-prebuilt-openssl"
Building OpenSSL works fine for me now with a fresh Cygwin.
Change-Id: Ic824704746ab59324e7a533b6c5545b6f1aa59f6
Diffstat (limited to 'external/openssl')
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 92c751e63f73..9ae7a1395cc6 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -60,8 +60,6 @@ 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))" \ @@ -71,7 +69,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): && unset MAKEFLAGS \ && nmake -f "ms\ntdll.mak" \ && mv inc32/* include/ \ - )) + ) else $(call gb_ExternalProject_get_state_target,openssl,build): |