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/curl | |
| 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/curl')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index b9ac6980d758..b074a937b189 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -69,10 +69,11 @@ $(call gb_ExternalProject_get_state_target,curl,build): else ifeq ($(COM),MSC) +$(eval $(call gb_ExternalProject_use_nmake,curl,build)) + $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ - CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ - MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \ + nmake -f Makefile.vc \ mode=dll \ VC=12 \ $(if $(filter X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \ |