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/xmlsec | |
| 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/xmlsec')
| -rw-r--r-- | external/xmlsec/ExternalProject_xmlsec.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk index a40e9a0b10ee..bdda2a53172f 100644 --- a/external/xmlsec/ExternalProject_xmlsec.mk +++ b/external/xmlsec/ExternalProject_xmlsec.mk @@ -19,13 +19,14 @@ $(eval $(call gb_ExternalProject_register_targets,xmlsec,\ ifeq ($(OS),WNT) +$(eval $(call gb_ExternalProject_use_nmake,xmlsec,build)) + $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js crypto=mscrypto xslt=no iconv=no static=no \ lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ - && unset MAKEFLAGS \ - && LIB="$(ILIB)" nmake \ + && nmake \ ,win32) else |