Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8fc3fe400ce6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fd3d64baa000
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 21, 2019

  1. gcc: fix mising avr limits.h 

    Fixes #69172
    @matthewbauer
    matthewbauer committed Sep 21, 2019
    Copy the full SHA
    7b58739 View commit details

  2. Merge pull request #69183 from matthewbauer/fix-avr-limits-h 

    gcc: fix mising avr limits.h
    @Mic92
    Mic92 authored Sep 21, 2019
    Copy the full SHA
    fd3d64b View commit details
Showing with 12 additions and 2 deletions.
  1. +6 −1 pkgs/development/compilers/gcc/8/default.nix
  2. +6 −1 pkgs/development/compilers/gcc/9/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/compilers/gcc/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -186,7 +186,12 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
)
else "");
else "")
+ stdenv.lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'LIMITS_H_TEST=false'
)
'';

inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
7 changes: 6 additions & 1 deletion pkgs/development/compilers/gcc/9/default.nix
View file
Original file line number Diff line number Diff line change
@@ -185,7 +185,12 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
)
else "");
else "")
+ stdenv.lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'LIMITS_H_TEST=false'
)
'';

inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;