diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-19 20:10:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-19 20:10:07 +0200 |
| commit | 38eea804e6c02542085c9f232cdd699d96c95a23 (patch) | |
| tree | 16c0b044abef442273e494420381770e6e2b45d5 | |
| parent | 01fc00cc816d974056b788dc0014b4908869b3b2 (diff) | |
| download | nixpkgs-38eea804e6c02542085c9f232cdd699d96c95a23.tar nixpkgs-38eea804e6c02542085c9f232cdd699d96c95a23.tar.gz nixpkgs-38eea804e6c02542085c9f232cdd699d96c95a23.tar.bz2 nixpkgs-38eea804e6c02542085c9f232cdd699d96c95a23.tar.lz nixpkgs-38eea804e6c02542085c9f232cdd699d96c95a23.tar.xz nixpkgs-38eea804e6c02542085c9f232cdd699d96c95a23.tar.zst nixpkgs-38eea804e6c02542085c9f232cdd699d96c95a23.zip | |
openjdk: fixup build after #44767
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 948948ebc44..2cf3389d3fc 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -106,6 +106,12 @@ 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=cc + CXX=c++ ''; configureFlags = [ |