curl/ExternalProject_curl.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5d95db97b8004ab557fe9a86082927d85bb0b053
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue Oct 30 14:50:44 2012 +0200
Fix MSVC build: LIB is not in environment so set it for the nmake command
Change-Id: Ic2f43692f003f6d3a88681d61fe21f52276b0b7b
diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk
index 1005094..7baca05 100644
--- a/curl/ExternalProject_curl.mk
+++ b/curl/ExternalProject_curl.mk
@@ -48,7 +48,7 @@ else ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR)/lib \
- && MAKEFLAGS= && LIB="$(ILIB)" && nmake -f Makefile.vc9 cfg=release-dll
\
+ && MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc9 cfg=release-dll \
EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE
$(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \
&& touch $@
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
