Revert "avrlibc: hook up libdir for cc-wrapper"

This reverts commit b2844f89d10d4a2665aed231144950c354f275a6.

It broke simavr:

$ nix-build -A simavr
[...]
/nix/store/3k4djrsq23m2yg9ar4h1lkkz1ijv0ghv-avr-binutils-2.41/bin/avr-ld: /nix/store/3rpyzla18mbj690hv7j5dang0kd3c1fq-avr-libc-avr-2.1.0/avr/lib/libc.a(vfprintf_std.o): in function `.L15':
vfprintf.c:(.text.avr-libc+0xd8): undefined reference to `__mulqi3'
/nix/store/3k4djrsq23m2yg9ar4h1lkkz1ijv0ghv-avr-binutils-2.41/bin/avr-ld: /nix/store/3rpyzla18mbj690hv7j5dang0kd3c1fq-avr-libc-avr-2.1.0/avr/lib/libc.a(vfprintf_std.o): in function `.L18':
vfprintf.c:(.text.avr-libc+0xe4): undefined reference to `__mulqi3'
collect2: error: ld returned 1 exit status
make[1]: *** [../Makefile.common:161: atmega644_adc_test.axf] Error 1
make[1]: Leaving directory '/build/source/tests'
make: *** [Makefile:21: build-tests] Error 2

Fixes #295610.

+12 -1
+6
pkgs/build-support/bintools-wrapper/default.nix
··· 325 325 hardening_unsupported_flags+=" relro bindnow" 326 326 '' 327 327 328 + + optionalString (libc != null && targetPlatform.isAvr) '' 329 + for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do 330 + echo "-L${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags 331 + done 332 + '' 333 + 328 334 + optionalString stdenv.targetPlatform.isDarwin '' 329 335 echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags 330 336 ''
+6
pkgs/build-support/cc-wrapper/default.nix
··· 668 668 hardening_unsupported_flags+=" stackprotector" 669 669 '' 670 670 671 + + optionalString (libc != null && targetPlatform.isAvr) '' 672 + for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do 673 + echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-crt1-cflags 674 + done 675 + '' 676 + 671 677 + optionalString stdenv.targetPlatform.isDarwin '' 672 678 echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags 673 679 ''
-1
pkgs/development/misc/avr/libc/default.nix
··· 19 19 20 20 passthru = { 21 21 incdir = "/avr/include"; 22 - libdir = "/avr/lib"; 23 22 }; 24 23 25 24 meta = with lib; {