about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-02 14:44:13 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-03 11:56:40 +0100
commit2f31a7ccc6b32ecd051898f65cc60415d914fcbc (patch)
tree6a15e739e20767fd782619e433a7d9b926c4c950 /pkgs/top-level
parent0c93c758bfc711edba57b765e9d6889c796af90b (diff)
downloadnixlib-2f31a7ccc6b32ecd051898f65cc60415d914fcbc.tar
nixlib-2f31a7ccc6b32ecd051898f65cc60415d914fcbc.tar.gz
nixlib-2f31a7ccc6b32ecd051898f65cc60415d914fcbc.tar.bz2
nixlib-2f31a7ccc6b32ecd051898f65cc60415d914fcbc.tar.lz
nixlib-2f31a7ccc6b32ecd051898f65cc60415d914fcbc.tar.xz
nixlib-2f31a7ccc6b32ecd051898f65cc60415d914fcbc.tar.zst
nixlib-2f31a7ccc6b32ecd051898f65cc60415d914fcbc.zip
openjdk: Build only once
Since javac doesn't do much optimisation, bootstrapping twice is
unlikely to produce a faster compiler.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1503f87077be..90f98cab65dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 {