summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-10-30 07:47:09 -0500
committerWill Dietz <w@wdtz.org>2018-10-30 07:48:07 -0500
commit00a51a9669c0883b13a7bb5273641c3f8cd29694 (patch)
treedbaaf36dff670315c4a3bfe70ed7d33f8f33083d /pkgs/development/compilers/gcc
parentd2e78403a849e788a7343bc5aea89cb1aa51e220 (diff)
downloadnixpkgs-00a51a9669c0883b13a7bb5273641c3f8cd29694.tar
nixpkgs-00a51a9669c0883b13a7bb5273641c3f8cd29694.tar.gz
nixpkgs-00a51a9669c0883b13a7bb5273641c3f8cd29694.tar.bz2
nixpkgs-00a51a9669c0883b13a7bb5273641c3f8cd29694.tar.lz
nixpkgs-00a51a9669c0883b13a7bb5273641c3f8cd29694.tar.xz
nixpkgs-00a51a9669c0883b13a7bb5273641c3f8cd29694.tar.zst
nixpkgs-00a51a9669c0883b13a7bb5273641c3f8cd29694.zip
gcc6: don't apply patches included in update to 6.5
Diffstat (limited to 'pkgs/development/compilers/gcc')
-rw-r--r--pkgs/development/compilers/gcc/6/default.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index ea72fff8690..56e6af50c2d 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -57,8 +57,6 @@ let version = "6.5.0";
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langFortran ../gfortran-driving.patch
-      ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
-      ++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
       ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
       ;