diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-15 16:46:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-15 16:50:55 +0200 |
| commit | fa2006828ff69509e1ead755af906dcd35a992bf (patch) | |
| tree | a5ecc531535c4f5fedbf40f159de2b723fce3a7e /solenv | |
| parent | 19e298646d52f63554f9517ff19b7a7f5d1e3b52 (diff) | |
Fix pyuno.so name on Mac OS X
...which also needs a change to the logic that symlinks *.jnilib to *.dylib, as
that would have symlinked pyuno.so onto itself (as it contains no .dylib). (And
while we are at that, anyway, also only store relative paths in the symlinks.)
Change-Id: I6f3e9effc4d185df935795958cc84e60e862a424
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 984ec6a835d3..425c7d6fb094 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -236,7 +236,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(LAYER) $(1) &&) \ $(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ - ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \ + ln -sf $(notdir $(1)) $(basename $(1)).jnilib &&) \ rm -f $${DYLIB_FILE}) endef |