JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixDarwinDylibNames: set name of install_name_tool

Browse Source
This commit is contained in:
Andrew Childs 2020-11-19 17:18:44 +09:00
parent 9fb8924389
commit c696fcdacb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh
View File

@ -23,7 +23,7 @@ fixDarwinDylibNames() {
for fn in "$@"; do for fn in "$@"; do
if [ -L "$fn" ]; then continue; fi if [ -L "$fn" ]; then continue; fi
echo "$fn: fixing dylib" echo "$fn: fixing dylib"
int_out=$(install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1) int_out=$(@targetPrefix@install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1)
result=$? result=$?
if [ "$result" -ne 0 ] && if [ "$result" -ne 0 ] &&
! grep "shared library stub file and can't be changed" <<< "$out" ! grep "shared library stub file and can't be changed" <<< "$out"

4
pkgs/top-level/all-packages.nix
View File

@ -641,7 +641,9 @@ in
setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh;
fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; fixDarwinDylibNames = makeSetupHook {
substitutions = { inherit (binutils) targetPrefix; };
} ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;