diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-21 15:37:15 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-08-22 01:14:53 +0200 |
| commit | 5a012fdbb3f7752b333cb631c39d73518e930559 (patch) | |
| tree | 243279bfe2ee63eece23e98dd74e8b94e43c941b | |
| parent | 13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b (diff) | |
| download | nixlib-5a012fdbb3f7752b333cb631c39d73518e930559.tar nixlib-5a012fdbb3f7752b333cb631c39d73518e930559.tar.gz nixlib-5a012fdbb3f7752b333cb631c39d73518e930559.tar.bz2 nixlib-5a012fdbb3f7752b333cb631c39d73518e930559.tar.lz nixlib-5a012fdbb3f7752b333cb631c39d73518e930559.tar.xz nixlib-5a012fdbb3f7752b333cb631c39d73518e930559.tar.zst nixlib-5a012fdbb3f7752b333cb631c39d73518e930559.zip | |
Revert "openjdk: fixup build after #44767"
This reverts commit 38eea804e6c02542085c9f232cdd699d96c95a23.
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index e82f40fc089e..948948ebc44e 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -106,12 +106,6 @@ let # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + stdenv.lib.optionalString stdenv.cc.isGNU '' NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" - '' - # The configure script was confused by our passing these with full paths, - # so we explicitly override them to short variants. - + '' - CC=${stdenv.cc.targetPrefix}cc - CXX=${stdenv.cc.targetPrefix}c++ ''; configureFlags = [ |