RepositoryExternal.mk | 2 +-
external/curl/ExternalProject_curl.mk | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit cce2149365fbf8599de18b277451aca0d0ce5f73
Author: Mike Kaganski <mikekagan...@collabora.com>
Date: Thu May 24 06:45:27 2018 -0700
Fix curl build on MSVC2013
Change-Id: Ie2e85d5c9945d4204f69135bc59e1d668294a83f
Reviewed-on: https://gerrit.libreoffice.org/54770
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b7eb499504d3..8f0bf9f83d06 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2684,7 +2684,7 @@ $(call gb_LinkTarget_set_include,$(1),\
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call gb_UnpackedTarball_get_dir,curl)/lib/$(if
$(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll)/libcurl$(if
$(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \
+ $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if
$(filter X86_64,$(CPUNAME)),x64,x86)-$(if
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if
$(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 136e50f3a81c..4a0b4d50a608 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -70,11 +70,10 @@ $(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,\
- nmake -f Makefile.vc \
+ CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter
-%,$(CC))" \
+ MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \
mode=dll \
VC=12 \
$(if $(filter
X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
