From 38eea804e6c02542085c9f232cdd699d96c95a23 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 19 Aug 2018 20:10:07 +0200 Subject: openjdk: fixup build after #44767 --- pkgs/development/compilers/openjdk/8.nix | 6 ++++++ 1 file changed, 6 insertions(+) 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 = [ -- cgit 1.4.1