Author: viric
Date: Fri Nov 12 21:04:19 2010
New Revision: 24679
URL: https://svn.nixos.org/websvn/nix/?rev=24679&sc=1
Log:
Fixing ghdl build (its Makefiles cannot stand enableParallelBuild)
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/default.nix
Fri Nov 12 18:58:24 2010 (r24678)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/default.nix
Fri Nov 12 21:04:19 2010 (r24679)
@@ -127,7 +127,8 @@
passthru = { inherit langC langCC langFortran langVhdl langTreelang
enableMultilib; };
- enableParallelBuilding = true;
+ # ghdl does not build fine with parallel building
+ enableParallelBuilding = if langVhdl then false else true;
meta = {
homepage = "http://gcc.gnu.org/";;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
Fri Nov 12 18:58:24 2010 (r24678)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix
Fri Nov 12 21:04:19 2010 (r24679)
@@ -247,7 +247,8 @@
passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
enableMultilib version; };
- enableParallelBuilding = true;
+ # ghdl does not build fine with parallel building
+ enableParallelBuilding = if langVhdl then false else true;
meta = {
homepage = http://gcc.gnu.org/;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
