external/icu/ExternalProject_icu.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b603c7629143b99f19f7ac6c4da2ab67d5ba20df
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 6 10:55:39 2018 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Sep 6 13:56:21 2018 +0200

    ofz#10100 dump failed icu config.log on failure
    
    Change-Id: I53059b6be263b2abc00e8818a9aeae74b9902a1c
    Reviewed-on: https://gerrit.libreoffice.org/60082
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/external/icu/ExternalProject_icu.mk 
b/external/icu/ExternalProject_icu.mk
index d4a3e9e7a9cb..d52f3e5d3036 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -74,7 +74,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
                                --with-data-packaging=static --enable-static 
--disable-shared --disable-dyload,\
                                --disable-static --enable-shared $(if $(filter 
ANDROID,$(OS)),--with-library-suffix=lo)) \
                        $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)\
-                               
--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
+                               
--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) || cat 
config.log \
                && $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) \
                $(if $(filter MACOSX,$(OS)), \
                        && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to