[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/platform/macosx.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 922f6c6244631cbd61c6a683e88c4040af35a614
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Fri Jul 27 14:59:56 2018 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Fri Jul 27 14:59:56 2018 +0000

    Force .jnilibs to be folded in. Patch via Damjan.
    
    NOTE: AUXTARGETS is there to add additional targets that must/should
    delivered w/ the original libs. Good Tribal Knowledge

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index de50050fce45..5312895fdb7b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -387,6 +387,9 @@ $(call gb_Library_get_target,$(1)) \
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
 	$(call gb_Library_get_target,$(1)).$(gb_UDK_MAJOR)
 endif
+$(call gb_Library_get_target,$(1)) \
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \
+	$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_target,$(1)))
 
 endef