mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

switch to DYLD_FALLBACK_LIBRARY_PATH

Browse source
This commit is contained in:
Joey Hess 2012-09-25 11:58:36 -04:00
parent 0cfe1a5127
commit bd05228bb8
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ui-macos/git-annex.app/Contents/MacOS/runshell
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
# Runs a shell command (or interactive shell) using the binaries and
# libraries bundled with this app.
set -e set -e
base="$(dirname $0)" base="$(dirname $0)"
@ -23,16 +26,20 @@ cd "$base"
base="$(pwd)" base="$(pwd)"
cd "$orig" cd "$orig"
# Put our binaries first, so our overloaded libs don't get used with # Put our binaries first, to avoid issues with out of date or incompatable
# system binaries. # system binaries.
# Also avoids issues with out of date system binaries.
PATH=$base/bin:$PATH PATH=$base/bin:$PATH
export PATH export PATH
# Using DYLD_FALLBACK_LIBRARY_PATH rather than DYLD_LIBRARY_PATH, so as
# not to force binaries to link against possibly the wrong versions of
# libraries found in the path. With DYLD_FALLBACK_LIBRARY_PATH, the
# system's versions of libraries will be used when possible, and otherwise
# it will fall back to using the libraries bundled with this app.
for lib in "$(cat libdirs)"; do for lib in "$(cat libdirs)"; do
DYLD_LIBRARY_PATH="$base/$lib:$DYLD_LIBRARY_PATH" DYLD_FALLBACK_LIBRARY_PATH="$base/$lib:$DYLD_FALLBACK_LIBRARY_PATH"
done done
export DYLD_LIBRARY_PATH export DYLD_FALLBACK_LIBRARY_PATH
GIT_EXEC_PATH=$base/git-core GIT_EXEC_PATH=$base/git-core
export GIT_EXEC_PATH export GIT_EXEC_PATH