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>

7 files changed, 19 insertions, 16 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) \
diff --git a/external/libtommath/ExternalProject_libtommath.mk b/external/libtommath/ExternalProject_libtommath.mk
index 955adc8c4d3d..f534e62a126d 100644
--- a/external/libtommath/ExternalProject_libtommath.mk
+++ b/external/libtommath/ExternalProject_libtommath.mk
@@ -18,9 +18,7 @@ $(eval $(call gb_ExternalProject_use_nmake,libtommath,build))
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,libtommath,build):
 	$(call gb_ExternalProject_run,build,\
-		export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \
-		&& export LIB="$(ILIB)" \
-		&& nmake -nologo -f makefile.msvc \
+		nmake -nologo -f makefile.msvc \
 	)
 else
 $(call gb_ExternalProject_get_state_target,libtommath,build) :
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):
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):
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/ \
 	)
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index 85699503f627..f6617e52fcd8 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -21,9 +21,11 @@ $(eval $(call gb_ExternalProject_register_targets,postgresql,\
 
 ifeq ($(OS),WNT)
 
+$(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
+
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
 	$(call gb_ExternalProject_run,build,\
-		MAKEFLAGS= && nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
+		nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
 	,src)
 
 else
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