diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-24 14:16:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-24 14:16:24 +0200 |
| commit | 470b4a03bf6d5f6340c201066a10d72ad7b01107 (patch) | |
| tree | 6ddfbd2beb76b62cf466e28576cbe5db1acf5b63 /solenv | |
| parent | a843992b7a21d2c4bb1fc91e8465738af78c1151 (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 6d7edb2e799e..10f230b79821 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; |