[Libreoffice-commits] core.git: libwpg/ExternalProject_libwpg.mk

Tor Lillqvist tlillqvist at suse.com
Wed May 15 01:54:37 PDT 2013


 libwpg/ExternalProject_libwpg.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 050a51b69e89e230e157be52d8b23862f3c06ba8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed May 15 11:48:43 2013 +0300

    Fix MSVC build
    
    Have to pass AR=lib.exe and SED=sed.exe on the configure command line,
    otherwise for some reason it doesn't know what archiver to use, and
    thinks it can't find a sed that does not truncate output.
    
    Change-Id: I1ce211119e62b6ecf6a2fc8fc89cdde2c7bb985a

diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk
index 226474c..5c858cb 100644
--- a/libwpg/ExternalProject_libwpg.mk
+++ b/libwpg/ExternalProject_libwpg.mk
@@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
 			--disable-debug \
 			--disable-werror \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
 	)
 


More information about the Libreoffice-commits mailing list