Unverified Commit e2c4c9ea authored by Emily Trau's avatar Emily Trau Committed by GitHub
Browse files

Merge pull request #220442 from pennae/avr

avrlibc: build faster, make attiny devices work
parents d35201a8 b2844f89
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -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
    ''
+0 −6
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -15,8 +15,11 @@ stdenv.mkDerivation rec {
  stripDebugList = [ "bin" ];
  dontPatchELF = true;

  enableParallelBuilding = true;

  passthru = {
    incdir = "/avr/include";
    libdir = "/avr/lib";
  };

  meta = with lib; {