external/icu/ExternalProject_icu.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit c7ec505e9cc34d71e67eb8a6b69e27517ec5bfb0
Author: Michael Stahl <mst...@redhat.com>
AuthorDate: Mon Jul 7 23:06:54 2014 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Fri Aug 31 17:40:43 2018 +0200
icu: pass in install program as native path, so Win32 make can invoke it
No idea why this wasn't a problem before.
(cherry picked from commit 108ad26747f6fa6667dd65759d64d71e92979742)
Conflicts:
external/icu/ExternalProject_icu.mk
Change-Id: Icbb94111061079069e2fc2102cfa4fe4bdd59bb9
diff --git a/external/icu/ExternalProject_icu.mk
b/external/icu/ExternalProject_icu.mk
index 1da4727c2fe9..a05d9c665a19 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -23,6 +23,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_ExternalProject_run,build,\
export LIB="$(ILIB)" \
&& CFLAGS="-arch:SSE $(SOLARINC)" CPPFLAGS="$(SOLARINC)"
CXXFLAGS="-arch:SSE $(SOLARINC)" \
+ INSTALL=`cygpath -m /usr/bin/install` \
./runConfigureICU \
$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug
--disable-release) \
Cygwin/MSVC \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
