Merge branch 'staging' into glibc230

2020-02-01 17:42:03 +01:00
parent 1bb18d9e8d 5ff1a53a32
commit ea8ae88f04
265 changed files with 3902 additions and 3038 deletions
@@ -1,4 +1,4 @@
-{ stdenv, stdenv49, gccStdenv, llvmPackages
+{ gcc6Stdenv, stdenv, gccStdenv, llvmPackages
 , lib, fetchurl, fetchpatch, fetchFromGitHub

 , cmake, ninja, which, findutils, m4, gawk
@@ -42,6 +42,7 @@ in with builtins; {
    patches = [
      ./patches/ldflags-5.1.patch
      ./patches/fix-scm-version.patch
+      ./patches/gcc-fixes.patch
      python3-six-patch
      python3-print-patch
    ];
@@ -55,6 +56,7 @@ in with builtins; {
    patches = [
      ./patches/ldflags-5.2.patch
      ./patches/fix-scm-version.patch
+      ./patches/gcc-fixes.patch
      python3-six-patch
      python3-print-patch
    ];