gcj: add 47 and 48, make 47 default

gcj48 doesn't build yet
This commit is contained in:
Vladimír Čunát 2013-07-08 09:14:23 +02:00
parent 5554533b4a
commit 480bcf9f83

View file

@ -2389,7 +2389,7 @@ let
profiledCompiler = false;
});
gcj = gcj45;
gcj = gcj47;
gcj44 = wrapGCC (gcc44.gcc.override {
name = "gcj";
@ -2433,6 +2433,34 @@ let
libXrandr xproto renderproto xextproto inputproto randrproto;
});
gcj47 = wrapGCC (gcc47.gcc.override {
name = "gcj";
langJava = true;
langFortran = false;
langCC = true;
langC = false;
profiledCompiler = false;
inherit zip unzip zlib boehmgc gettext pkgconfig perl;
inherit gtk;
inherit (gnome) libart_lgpl;
inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
libXrandr xproto renderproto xextproto inputproto randrproto;
});
gcj48 = wrapGCC (gcc48.gcc.override {
name = "gcj";
langJava = true;
langFortran = false;
langCC = false;
langC = false;
profiledCompiler = false;
inherit zip unzip zlib boehmgc gettext pkgconfig perl;
inherit gtk;
inherit (gnome) libart_lgpl;
inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
libXrandr xproto renderproto xextproto inputproto randrproto;
});
gnat = gnat45;
gnat44 = wrapGCC (gcc44.gcc.override {