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

[Libreoffice Gerrit user]

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

New commits:
commit 2daa2d8a77c802cfad84ef952a99606e3bcc467f
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Wed Jul 18 18:18:15 2018 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Wed Jul 18 18:18:15 2018 +0000

    update

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3b2fbcb6650f..103b09f53aa4 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -298,7 +298,8 @@ $(call gb_Helper_abbreviate_dirs,\
 		`cat $${DYLIB_FILE}` && \
 	$(if $(filter Library,$(TARGETTYPE)),\
 		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
-		ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
+		ln -f $(if $(call gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
+		      $(patsubst %.dylib,%.jnilib,$(1)) &&) \
 	rm -f $${DYLIB_FILE})
 endef