From bf444739ec4fae170fa7fc3fdaa201a914000b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Dec 2020 22:13:29 +0100 Subject: [PATCH] Revert "Merge #107253: bintools-wrapper: fix inverted link32 check" This reverts commit 241c3912555e0f80e3a61a808c70986f0f4cb8fe, reversing changes made to ab8c2b2b2ca6579104f5692ead859db31030de35. These toolchain changes are too problematic, so reverting for now; see https://github.com/NixOS/nixpkgs/pull/107086#issuecomment-749196366 --- pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index bdffdc3b785..abecf6a8e5d 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -145,7 +145,7 @@ then done fi -if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then +if [[ "$link32" = "0" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's # use it. extraAfter+=(