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/libxslt | |
| 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/libxslt')
| -rw-r--r-- | external/libxslt/ExternalProject_libxslt.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/libxslt/ExternalProject_libxslt.mk b/external/libxslt/ExternalProject_libxslt.mk index 27667299e383..8d6a40f5e187 100644 --- a/external/libxslt/ExternalProject_libxslt.mk +++ b/external/libxslt/ExternalProject_libxslt.mk @@ -15,14 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,libxslt,\ build \ )) ifeq ($(OS),WNT) +$(eval $(call gb_ExternalProject_use_nmake,libxslt,build)) + $(call gb_ExternalProject_get_state_target,libxslt,build): $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js \ $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ vcmanifest=yes \ lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ - && unset MAKEFLAGS \ - && LIB="$(ILIB)" nmake \ + && nmake \ ,win32) else # OS!=WNT $(call gb_ExternalProject_get_state_target,libxslt,build): |