From bd078c1a313a0eadb8232f3732e9700cc52253b1 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 18 May 2018 17:03:35 -0500 Subject: [PATCH] gcc5: remove patch The patch fails to apply & may not be necessary any more. Trying to remove it for now just to see. Hydra log: https://hydra.nixos.org/build/72726891/nixlog/1 Also see #33722 /cc @copumpkin --- pkgs/development/compilers/gcc/5/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 443f3a7cf0b..8c1170213f8 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -62,10 +62,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";