From 5a012fdbb3f7752b333cb631c39d73518e930559 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Aug 2018 15:37:15 -0500 Subject: [PATCH] Revert "openjdk: fixup build after #44767" This reverts commit 38eea804e6c02542085c9f232cdd699d96c95a23. --- pkgs/development/compilers/openjdk/8.nix | 6 ------ 1 file changed, 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 = [