diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-04-20 15:41:48 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-04-20 20:13:44 +0000 |
| commit | 77568e5c970ee14d92de765686689ba6fccf2a17 (patch) | |
| tree | 94d41ef722f9c0e3a949b0d73382e4634b497c8f /solenv | |
| parent | Resolves tdf#83366 Copy and Paste crashes Calc when original doc closed (diff) | |
| download | core-77568e5c970ee14d92de765686689ba6fccf2a17.tar.gz core-77568e5c970ee14d92de765686689ba6fccf2a17.zip | |
don't try to sign merged libs on windows
as those are fake, just textfiles with dll extension that signtool
doesn't like.
Also made the text more descriptive "invalid" is ambiguous,
"invalid - merged lib" states the reason why the file is a dummy.
Change-Id: I31801fd0c3aa593549fac5e6275189e18bbc0010
Reviewed-on: https://gerrit.libreoffice.org/15444
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index d1602c997022..82c47399d6f2 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -486,8 +486,8 @@ define gb_LinkTarget__command_impl $(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))),\ $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))),\ $(call gb_LinkTarget__command,$(1),$(2)),\ - mkdir -p $(dir $(1)) && echo invalid > $(1) \ - $(if $(SOVERSIONSCRIPT),&& echo invalid > $(WORKDIR)/LinkTarget/$(2))),\ + mkdir -p $(dir $(1)) && echo invalid - merged lib > $(1) \ + $(if $(SOVERSIONSCRIPT),&& echo invalid - merged lib > $(WORKDIR)/LinkTarget/$(2))),\ $(call gb_LinkTarget__command,$(1),$(2))) $(call gb_LinkTarget__command_objectlist,$(WORKDIR)/LinkTarget/$(2).objectlist) endef |