diff options
| author | Alyssa Ross <hi@alyssa.is> | 2018-11-15 21:02:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-30 18:19:17 +0000 |
| commit | b9b83748f32b105b2cca0242ae4131521ad18290 (patch) | |
| tree | 52dc932929c0eab660c8ee706a93ce69ef610384 /pkgs/build-support | |
| parent | 4abc6ff9e86e32a59be69f2a2200c091b1aea7f1 (diff) | |
| download | nixpkgs-b9b83748f32b105b2cca0242ae4131521ad18290.tar nixpkgs-b9b83748f32b105b2cca0242ae4131521ad18290.tar.gz nixpkgs-b9b83748f32b105b2cca0242ae4131521ad18290.tar.bz2 nixpkgs-b9b83748f32b105b2cca0242ae4131521ad18290.tar.lz nixpkgs-b9b83748f32b105b2cca0242ae4131521ad18290.tar.xz nixpkgs-b9b83748f32b105b2cca0242ae4131521ad18290.tar.zst nixpkgs-b9b83748f32b105b2cca0242ae4131521ad18290.zip | |
gcj: fix build on Darwin
Partially addresses https://github.com/NixOS/nixpkgs/issues/29715.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 1b36f5f555d..af2ff0cc966 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -23,7 +23,14 @@ fixDarwinDylibNames() { for fn in "$@"; do if [ -L "$fn" ]; then continue; fi echo "$fn: fixing dylib" - install_name_tool -id "$fn" "${flags[@]}" "$fn" + int_out=$(install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1) + result=$? + if [ "$result" -ne 0 ] && + ! grep "shared library stub file and can't be changed" <<< "$out" + then + echo "$int_out" >&2 + exit "$result" + fi done } |