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/libxml2 | |
parent | cc9b39393bfeca69020b28e9a38335c5f39a4c72 (diff) |
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/libxml2')
-rw-r--r-- | external/libxml2/ExternalProject_libxml2.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/libxml2/ExternalProject_libxml2.mk b/external/libxml2/ExternalProject_libxml2.mk index c27efdf36b72..0d8559dfb04f 100644 --- a/external/libxml2/ExternalProject_libxml2.mk +++ b/external/libxml2/ExternalProject_libxml2.mk @@ -16,13 +16,14 @@ $(eval $(call gb_ExternalProject_register_targets,libxml2,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_use_external_project,libxml2,icu) +$(eval $(call gb_ExternalProject_use_nmake,libxml2,build)) + $(call gb_ExternalProject_get_state_target,libxml2,build): $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js \ iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ - && unset MAKEFLAGS \ - && LIB="$(ILIB)" nmake \ + && nmake \ ,win32) else # OS!=WNT $(call gb_ExternalProject_get_state_target,libxml2,build): |