From 04c364d181cad9e0bd196885ee3e0f3bb139168d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Dec 2013 15:41:24 +0100 Subject: [PATCH] gnat: Attempt to fix random build failures Sometimes the build failes with: In file included from ../../gcc-4.4.6/gcc/ada/seh_init.c:44: ../../gcc-4.4.6/gcc/system.h:418: error: conflicting types for 'strsignal' /nix/store/6h129q168ahnl2nzw6azr239cba884ng-glibc-2.18/include/string.h:560: note: previous declaration of 'strsignal' was here and sometimes it doesn't. Hopefully disabling parallel builds fixes this. http://hydra.nixos.org/build/7179481 --- pkgs/development/compilers/gcc/4.4/default.nix | 2 +- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 60e7baa7781..3ecaf5cb5d2 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -246,7 +246,7 @@ stdenv.mkDerivation ({ enableMultilib version; }; # ghdl does not build fine with parallel building - enableParallelBuilding = !langVhdl; + enableParallelBuilding = !langVhdl && !langAda; meta = { homepage = http://gcc.gnu.org/; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index cb0432b6672..e63ff7947f6 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -360,7 +360,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langAda langFortran langVhdl enableMultilib version; }; - enableParallelBuilding = true; + enableParallelBuilding = !langAda; meta = { homepage = http://gcc.gnu.org/; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index d7d9325ca4f..35255d0af5b 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -434,7 +434,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langAda langFortran langVhdl langGo version; }; - enableParallelBuilding = true; + enableParallelBuilding = !langAda; inherit (stdenv) is64bit;