From cfa4e0ac149b186a8fc965814c3cac5b2e74459c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Aug 2018 04:10:59 -0400 Subject: [PATCH] openjdk: Fix a cross problem 38eea804e6c02542085c9f232cdd699d96c95a23 dropped the C and C++ compiler prefixes. Probably more work is needed to make cross work, but this at least helps preserve/establish the pattern. --- pkgs/development/compilers/openjdk/8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 2cf3389d3fc66..e82f40fc089eb 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -110,8 +110,8 @@ let # The configure script was confused by our passing these with full paths, # so we explicitly override them to short variants. + '' - CC=cc - CXX=c++ + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ ''; configureFlags = [