diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-12-21 22:13:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-12-21 22:26:50 +0100 |
| commit | bf444739ec4fae170fa7fc3fdaa201a914000b03 (patch) | |
| tree | 66f9050ba30de1620ee52df57e407da090645ae3 /pkgs/build-support/bintools-wrapper/ld-wrapper.sh | |
| parent | 85b7955180c6025f564ea05f02bd48dafc8b4c4c (diff) | |
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
Diffstat (limited to 'pkgs/build-support/bintools-wrapper/ld-wrapper.sh')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index bdffdc3b7855c..abecf6a8e5d1e 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+=( |