summaryrefslogtreecommitdiff
path: root/postprocess
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-10-30 22:26:56 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-10-31 15:41:38 +0100
commit37eab9181cdd099935148bc911163f861a2c8d3f (patch)
tree8a5993616676bc5bf75d77cd3d655f4b27919642 /postprocess
parent71d9a61302e65fe091cf70c13fa72b3df09b7e3a (diff)
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@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'postprocess')
-rw-r--r--postprocess/CustomTarget_signing.mk2
1 files changed, 1 insertions, 1 deletions
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,$@) \