summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc/6
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-08-27 22:06:04 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-11-05 19:09:53 +0100
commit0c01c58aec109d856aeb09fc3479b4af902174a2 (patch)
treec79bd4f1aca3596acc2fd5cdcfadae4a853f4b98 /pkgs/development/compilers/gcc/6
parent5f3b84e979a85765fd2f05b302d75b24b285f930 (diff)
downloadnixlib-0c01c58aec109d856aeb09fc3479b4af902174a2.tar
nixlib-0c01c58aec109d856aeb09fc3479b4af902174a2.tar.gz
nixlib-0c01c58aec109d856aeb09fc3479b4af902174a2.tar.bz2
nixlib-0c01c58aec109d856aeb09fc3479b4af902174a2.tar.lz
nixlib-0c01c58aec109d856aeb09fc3479b4af902174a2.tar.xz
nixlib-0c01c58aec109d856aeb09fc3479b4af902174a2.tar.zst
nixlib-0c01c58aec109d856aeb09fc3479b4af902174a2.zip
gcc6: fix build with new glibc, by upstream patches
Diffstat (limited to 'pkgs/development/compilers/gcc/6')
-rw-r--r--pkgs/development/compilers/gcc/6/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 47cb93c19953..7d019c7fe848 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -72,7 +72,9 @@ let version = "6.4.0";
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
-      ++ optional langFortran ../gfortran-driving.patch;
+      ++ optional langFortran ../gfortran-driving.patch
+      ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
+      ;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at