ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #220442 from pennae/avr

Browse Source 
avrlibc: build faster, make attiny devices work
This commit is contained in:
Emily Trau 2023-12-04 00:19:42 +11:00 committed by GitHub
commit e2c4c9eafd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 12 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

@ -301,12 +301,6 @@ 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

@ -649,12 +649,6 @@ 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
''

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

@ -15,8 +15,11 @@ stdenv.mkDerivation rec {
stripDebugList = [ "bin" ];
dontPatchELF = true;
enableParallelBuilding = true;
passthru = {
incdir = "/avr/include";
libdir = "/avr/lib";
};
meta = with lib; {