[Libreoffice-commits] core.git: solenv/bin

[Stephan Bergmann]

 solenv/bin/macosx-change-install-names.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 470b4a03bf6d5f6340c201066a10d72ad7b01107
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 24 14:16:24 2013 +0200

    Allow NONE libs to find each other on Mac OS X
    
    ...otherwise e.g. during execution of sw/PythonTest_sw_python.mk
    workdir/*/LinkTarget/Library/libtest.dylib would not find
    workdir/*/LinkTarget/Library/libunotest.dylib without yet another addition to
    DYLD_LIBRARY_PATH.  (Special cases where NONE libs are located somewhere else
    than workdir/*/LinkTarget/Library/ can be and are still found via
    DYLD_LIBRARY_PATH.)
    
    Change-Id: Ia301746842ef49393d0229915c01b61e378ca100

diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 6d7edb2..10f230b 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -61,7 +61,7 @@ sub action($$$)
          'shl/OXT/URELIB' => ($OLD ? '@executable_path/urelibs' : '@executable_path/../Frameworks'),
          'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
          'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
-         'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__');
+         'shl/NONE/NONE' => '@loader_path');
     my ($type, $loc1, $loc2) = @_;
     my $act = $action{"$type/$loc1/$loc2"};
     die "illegal combination $type/$loc1/$loc2" unless defined $act;