dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #295954 from bjornfor/revert-avrlibc-revdeps-breakage

Browse Source 
Revert "avrlibc: hook up libdir for cc-wrapper"
This commit is contained in:
Emily Trau 2024-03-16 14:34:01 +11:00 committed by GitHub
commit 8bb29a3881
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -325,6 +325,12 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" relro bindnow"
''
+ optionalString (libc != null && targetPlatform.isAvr) ''
for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
echo "-L${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags
done
''
+ optionalString stdenv.targetPlatform.isDarwin ''
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
''

6
pkgs/build-support/cc-wrapper/default.nix
View File

@ -668,6 +668,12 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" stackprotector"
''
+ optionalString (libc != null && targetPlatform.isAvr) ''
for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-crt1-cflags
done
''
+ optionalString stdenv.targetPlatform.isDarwin ''
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
''

1
pkgs/development/misc/avr/libc/default.nix
View File

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
passthru = {
incdir = "/avr/include";
libdir = "/avr/lib";
};
meta = with lib; {