Merge branch 'staging-next' into staging

2019-09-22 10:06:45 +02:00
parent 5505d2f036 76b7dd1ba9
commit 6c567ed797
61 changed files with 889 additions and 534 deletions
@@ -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;
@@ -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;