[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Tue Oct 31 14:42:03 UTC 2017


 postprocess/CustomTarget_signing.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37eab9181cdd099935148bc911163f861a2c8d3f
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Oct 30 22:26:56 2017 +0100

    msc-externals: don't attempt to chmod nonexisting files
    
    440ac656f783a7a5e33431410a1c038b7d04c42e forgot to also guard the
    chmod and thus 64bit builds on windows fail when attempting to sign, as
    in this case there is no cross-compiled explorer extension and the dlls
    are not copied into instdir
    
    Change-Id: Ie17a079b64256d3ef0bf253bdda6cfe722dac3e2
    Reviewed-on: https://gerrit.libreoffice.org/44076
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index 573c396f49de..b3aaf264f76c 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -33,7 +33,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE)
 	cat $(SRCDIR)/postprocess/signing/no_signing.txt > $$EXCLUDELIST && \
 	echo "$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_filename,$(lib)))" | tr ' ' '\n' >> $$EXCLUDELIST && \
 	$(if $(UCRT_REDISTDIR),chmod u+w $(foreach lib,$(UCRT_DLLS),$(INSTDIR)/$(LIBO_URE_LIB_FOLDER)/$(lib)) &&) \
-	chmod u+w $(foreach lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) && \
+	$(if $(BUILD_X64),chmod u+w $(foreach lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) &&) \
 	$(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
 			-e $$EXCLUDELIST \
 			-l $(subst .done,_log.txt,$@) \


More information about the Libreoffice-commits mailing list