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

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

Revert "avrlibc: hook up libdir for cc-wrapper"
parents 41e5dde7 6ff5b790

pkgs/build-support/bintools-wrapper/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -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

    ''

pkgs/build-support/cc-wrapper/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -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

    ''

pkgs/development/misc/avr/libc/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec { 


  passthru = {

    incdir = "/avr/include";

    libdir = "/avr/lib";

  };



  meta = with lib; {