cc-wrapper: Clean up dynamic linking with x86 multilib

It's better layering to do everything in ld-wrapper. Also, use numeric
comparisons for `relocatable`.
This commit is contained in:
John Ericson
2017-09-28 20:05:26 -04:00
parent 2cb098b7b4
commit fdbda216b1
2 changed files with 29 additions and 8 deletions
@@ -61,10 +61,6 @@ while (( "$n" < "$nParams" )); do
cppInclude=0
elif [ "${p:0:1}" != - ]; then
nonFlagArgs=1
elif [ "$p" = -m32 ]; then
if [ -e @out@/nix-support/dynamic-linker-m32 ]; then
NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)"
fi
fi
n+=1
done