Merge branch 'master' into staging

2018-05-19 11:12:19 +02:00
parent fc716e64a7 a0feedca8f
commit 90c0100139
24 changed files with 563 additions and 274 deletions
@@ -63,10 +63,6 @@ let version = "5.5.0";
      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
      ++ optional noSysDirs ../no-sys-dirs.patch
      ++ optional langFortran ../gfortran-driving.patch
-
-      # This could be applied unconditionally but I don't want to cause a full
-      # Linux rebuild.
-      ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch
      ++ optional stdenv.hostPlatform.isMusl (fetchpatch {
        url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;
        sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";