public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge #107253: bintools-wrapper: fix inverted link32 check"

Browse Source 
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
This commit is contained in:
Vladimír Čunát 2020-12-21 22:13:29 +01:00
parent 85b7955180
commit bf444739ec
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/bintools-wrapper/ld-wrapper.sh
View File

@ -145,7 +145,7 @@ then
done done
fi 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 # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's
# use it. # use it.
extraAfter+=( extraAfter+=(