summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-22 12:54:01 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-22 13:50:12 +0300
commit6a5a460e8a9592ca089ce15b0d2fd641db0c189a (patch)
tree8703501ab1f9ff6ba6c305dd9cb354a97ea9cae6 /solenv
parente0233480c674987cd0de301fde57248a7aba523d (diff)
Use codesign --force to replace a (bogus?) previous signature
For some reason I get an error message about soffice.bin already being signed, even though it isn't. Also ignore (bogus?) exit status from codesign. Change-Id: I0227cf9a3b098a5c16ea68643c84cdc0ded2a8f9
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/macosx.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 6035c673dee7..1423d1136f56 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -154,7 +154,7 @@ $(call gb_Helper_abbreviate_dirs,\
ln -sf $(notdir $(1)) $(basename $(1)).jnilib &&) \
$(if $(MACOSX_CODESIGNING_IDENTITY), \
$(if $(filter Executable,$(TARGETTYPE)), \
- codesign --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign $(MACOSX_CODESIGNING_IDENTITY) $(1) &&)) \
+ (codesign --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign $(MACOSX_CODESIGNING_IDENTITY) --force $(1) || true) &&)) \
$(if $(filter Library,$(TARGETTYPE)),\
otool -l $(1) | grep -A 5 LC_ID_DYLIB > $(1).exports.tmp && \
$(NM) -g -P $(1) | cut -d' ' -f1-2 | grep -v U$$ \