public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the gcc/gcc-wrapper so 'ghdl' gets the proper wrapper (langVhdl = true,

Browse Source 
from gcc).


svn path=/nixpkgs/branches/stdenv-updates/; revision=19714
This commit is contained in:
Lluís Batlle i Rossell 2010-01-27 16:29:11 +00:00
parent e04beb262e
commit 64f0d74319
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/gcc-wrapper/default.nix
View File

@ -15,7 +15,7 @@ assert !nativeTools -> gcc != null && binutils != null && coreutils != null;
assert !nativeLibc -> libc != null; assert !nativeLibc -> libc != null;
# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper
assert (gcc != null && gcc ? langVhdl) -> zlib != null; assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null;
let let
@ -47,8 +47,8 @@ stdenv.mkDerivation {
langC = if nativeTools then true else gcc.langC; langC = if nativeTools then true else gcc.langC;
langCC = if nativeTools then true else gcc.langCC; langCC = if nativeTools then true else gcc.langCC;
langFortran = if nativeTools then false else gcc ? langFortran; langFortran = if nativeTools then false else gcc ? langFortran;
langAda = if nativeTools then false else gcc ? langAda; langAda = if nativeTools then false else gcc ? langAda && gcc.langAda;
langVhdl = if nativeTools then false else gcc ? langVhdl; langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl;
zlib = if (gcc != null && gcc ? langVhdl) then zlib else null; zlib = if (gcc != null && gcc ? langVhdl) then zlib else null;
shell = if shell == "" then stdenv.shell else shell; shell = if shell == "" then stdenv.shell else shell;

3
pkgs/development/compilers/gcc-4.3/default.nix
View File

@ -124,7 +124,8 @@ stdenv.mkDerivation ({
inherit gmp mpfr; inherit gmp mpfr;
passthru = { inherit langC langCC langFortran langTreelang enableMultilib; }; passthru = { inherit langC langCC langFortran langVhdl langTreelang
enableMultilib; };
meta = { meta = {
homepage = "http://gcc.gnu.org/"; homepage = "http://gcc.gnu.org/";

3
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -184,7 +184,8 @@ stdenv.mkDerivation ({
++ optionals javaAwtGtk [ gmp mpfr ]))); ++ optionals javaAwtGtk [ gmp mpfr ])));
passthru = { inherit langC langCC langAda langFortran langTreelang enableMultilib; }; passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
enableMultilib; };
meta = { meta = {
homepage = http://gcc.gnu.org/; homepage = http://gcc.gnu.org/;