diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-14 18:08:57 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-14 18:11:55 +0200 |
commit | a382dad6afefdfc14b5d0c891ddbec149328de3d (patch) | |
tree | 0d2a0be8f0d25c7a04d3b6309c7b3aa682bb9b6a /solenv/gbuild/platform | |
parent | 1d0e18703523139e5fd6d11b6f3d72bb0b368036 (diff) |
Clean up Mac OS X .jnilibs
Those .jnilibs that are not needed as .dylibs (this includes those that are also
UNO components) are handled via RepositoryFixes.mk. The remaining one,
libjava_uno.jnilib is packaged as a symlink in instdir. Everything else is not
necessary and removed (including the venerable oddity macosx-create-bundle).
Change-Id: I34a1801b0733cdff885c1c72db16fa631c5d82ef
Diffstat (limited to 'solenv/gbuild/platform')
-rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index c486f2afbe1f..f99283629fb1 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -157,8 +157,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Executable,$(TARGETTYPE)), \ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app $(LAYER) $(1) &&) \ $(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\ - $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl shl $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ - ln -sf $(notdir $(1)) $(basename $(1)).jnilib &&) \ + $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl shl $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) &&) \ $(if $(MACOSX_CODESIGNING_IDENTITY), \ $(if $(filter Executable,$(TARGETTYPE)), \ (codesign --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign $(MACOSX_CODESIGNING_IDENTITY) --force $(1) || true) &&)) \ |