public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
gcc: fix mising avr limits.h
This commit is contained in:
Jörg Thalheim 2019-09-21 08:35:39 +01:00 committed by GitHub
commit fd3d64baa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/gcc/8/default.nix
View File

@ -186,7 +186,12 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' 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 inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw; libcCross crossMingw;

7
pkgs/development/compilers/gcc/9/default.nix
View File

@ -185,7 +185,12 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' 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 inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw; libcCross crossMingw;