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

[Libreoffice Gerrit user]

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

New commits:
commit cd9162eb5fd806037009c98ba3d832368bc34216
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Wed Feb 13 13:34:19 2019 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Wed Feb 13 13:34:19 2019 +0000

    Only symlink to jnilib if we are a dylib.
    
    Patch by damjan

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 1836061749df..1e814fd8ea15 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -319,7 +319,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		`cat $${DYLIB_FILE}` && \
 	$(if $(filter Library,$(TARGETTYPE)),\
 		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
-		ln -shf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
+		$(if $(filter %.dylib,$(1)),ln -shf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&)) \
 	rm -f $${DYLIB_FILE})
 endef