GCJ 4.4: Try to avoid FastJar since it appears to be broken.
svn path=/nixpkgs/trunk/; revision=16486
This commit is contained in:
parent
9b3655cef0
commit
032c603c8b
@ -7,14 +7,14 @@
|
||||
, gmp, mpfr, gettext, which
|
||||
, ppl ? null, cloogppl ? null # used by the Graphite optimization framework
|
||||
, bison ? null, flex ? null
|
||||
, fastjar ? null, zlib ? null, boehmgc ? null
|
||||
, zlib ? null, boehmgc ? null
|
||||
, zip ? null, unzip ? null
|
||||
, enableMultilib ? false
|
||||
, name ? "gcc"
|
||||
}:
|
||||
|
||||
assert langTreelang -> bison != null && flex != null;
|
||||
assert langJava -> fastjar != null && zip != null && unzip != null;
|
||||
assert langJava -> zip != null && unzip != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@ -69,7 +69,7 @@ stdenv.mkDerivation ({
|
||||
++ (optionals langTreelang [bison flex])
|
||||
++ (optional (zlib != null) zlib)
|
||||
++ (optional (boehmgc != null) boehmgc)
|
||||
++ (optionals langJava [fastjar zip unzip])
|
||||
++ (optionals langJava [zip unzip])
|
||||
;
|
||||
|
||||
configureFlags = "
|
||||
|
@ -1743,7 +1743,7 @@ let
|
||||
langCC = true;
|
||||
langC = false;
|
||||
profiledCompiler = false;
|
||||
inherit fastjar zip unzip zlib boehmgc gettext;
|
||||
inherit zip unzip zlib boehmgc gettext;
|
||||
});
|
||||
|
||||
#ghc = haskellPackages.ghc;
|
||||
|
Loading…
x
Reference in New Issue
Block a user