openjdk: Build only once

Since javac doesn't do much optimisation, bootstrapping twice is
unlikely to produce a faster compiler.
This commit is contained in:
Eelco Dolstra 2014-01-02 14:44:13 +01:00
parent 0c93c758bf
commit 2f31a7ccc6

View file

@ -2828,13 +2828,9 @@ let
else
let
openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {};
openjdkStage1 = callPackage ../development/compilers/openjdk {
jdk = openjdkBootstrap;
ant = pkgs.ant.override { jdk = openjdkBootstrap; };
};
in callPackage ../development/compilers/openjdk {
jdk = openjdkStage1;
ant = pkgs.ant.override { jdk = openjdkStage1; };
jdk = openjdkBootstrap;
ant = pkgs.ant.override { jdk = openjdkBootstrap; };
};
openjre = pkgs.openjdk.override {