diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2020-11-22 14:31:38 -0800 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2020-11-24 18:32:12 -0800 |
| commit | 9682c1d0da2c64042c274a590aed52f0ac7c571d (patch) | |
| tree | 0f6d81bf7b252ca653d274a38e7692b97253a38c /pkgs/build-support | |
| parent | 52271f44b17671ce6b100eadf7cd7e9d04d608aa (diff) | |
| download | nixlib-9682c1d0da2c64042c274a590aed52f0ac7c571d.tar nixlib-9682c1d0da2c64042c274a590aed52f0ac7c571d.tar.gz nixlib-9682c1d0da2c64042c274a590aed52f0ac7c571d.tar.bz2 nixlib-9682c1d0da2c64042c274a590aed52f0ac7c571d.tar.lz nixlib-9682c1d0da2c64042c274a590aed52f0ac7c571d.tar.xz nixlib-9682c1d0da2c64042c274a590aed52f0ac7c571d.tar.zst nixlib-9682c1d0da2c64042c274a590aed52f0ac7c571d.zip | |
linux bootstrap tools: fix tests on ppc64
The dynamic loader on powerpc64 is called ld64.so.2 rather than ld-linux.so.*, and was not matched by the existing pattern. We reuse the dynamicLinker name from binutils to match a wider set of platforms and to avoid specifying this information in two places.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 3b1b8ff570a8..15fcc3742932 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -56,6 +56,7 @@ let else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" + else if targetPlatform.system == "powerpc64le-linux" then "${libc_lib}/lib/ld64.so.2" # ARM with a wildcard, which can be "" or "-armhf". else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" |