Skip to content

Commit

Permalink
Revert "Merge #107253: bintools-wrapper: fix inverted link32 check"
Browse files Browse the repository at this point in the history
This reverts commit 241c391, reversing
changes made to ab8c2b2.

These toolchain changes are too problematic, so reverting for now; see
#107086 (comment)
  • Loading branch information
vcunat committed Dec 21, 2020
1 parent 85b7955 commit bf44473
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/build-support/bintools-wrapper/ld-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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+=(
Expand Down

0 comments on commit bf44473

Please sign in to comment.