From 6f95189f884548b72ce14cfdf70089c689918e54 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 4 Aug 2024 10:21:07 +0200 Subject: [PATCH] wrapBintoolsWith: add s390(x)-linux dynamic linkers This fixes autoPatchElfHook for these platforms. --- pkgs/build-support/bintools-wrapper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 7fe0762090c5..6e97d0cf00fa 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -127,6 +127,8 @@ let else if (with targetPlatform; isAarch32 && isLinux) then "${sharedLibraryLoader}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${sharedLibraryLoader}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${sharedLibraryLoader}/lib/ld.so.1" + else if targetPlatform.system == "s390-linux" then "${sharedLibraryLoader}/lib/ld.so.1" + else if targetPlatform.system == "s390x-linux" then "${sharedLibraryLoader}/lib/ld64.so.1" else if targetPlatform.isMips then "${sharedLibraryLoader}/lib/ld.so.1" # `ld-linux-riscv{32,64}-.so.1` else if targetPlatform.isRiscV then "${sharedLibraryLoader}/lib/ld-linux-riscv*.so.1"