diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-11-01 11:52:56 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-11-01 19:52:53 +0100 |
| commit | 4fcdc190afe710c2530ea40e30609570519a5ff2 (patch) | |
| tree | f0e297f50d7e11648cb917bb0ad97a0df00890e8 /external/openssl | |
| parent | Fix prefixes of "double" variables in Calc (financial) (diff) | |
| download | core-4fcdc190afe710c2530ea40e30609570519a5ff2.tar.gz core-4fcdc190afe710c2530ea40e30609570519a5ff2.zip | |
external: consistently use gb_ExternalProject_use_nmake
... instead of hard-coding some subset of the variables everywhere.
Change-Id: I5eac5663563ee9d6cb7b57f5f6e9d55560587276
Reviewed-on: https://gerrit.libreoffice.org/44167
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/openssl')
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 941da5b14eeb..211de4ab06fd 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -55,14 +55,13 @@ OPENSSL_PLATFORM := \ ) ifeq ($(COM),MSC) +$(eval $(call gb_ExternalProject_use_nmake,openssl,build)) + $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ - export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ - && export PERL="$(shell cygpath -w $(PERL))" \ - && export LIB="$(ILIB)" \ + export PERL="$(shell cygpath -w $(PERL))" \ && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ && cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \ - && unset MAKEFLAGS \ && nmake -f "ms\ntdll.mak" \ && mv inc32/* include/ \ ) |