about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Ericson <mail@JohnEricson.me>2018-08-20 04:10:59 -0400
committerVladimír Čunát <vcunat@gmail.com>2018-08-20 10:16:17 +0200
commitcfa4e0ac149b186a8fc965814c3cac5b2e74459c (patch)
tree21cfa0556c7db6d4956f27b42bba28a689f76116
parent440ac01e5aa89ee9963d0bbde8165c8c293d1065 (diff)
downloadnixlib-cfa4e0ac149b186a8fc965814c3cac5b2e74459c.tar
nixlib-cfa4e0ac149b186a8fc965814c3cac5b2e74459c.tar.gz
nixlib-cfa4e0ac149b186a8fc965814c3cac5b2e74459c.tar.bz2
nixlib-cfa4e0ac149b186a8fc965814c3cac5b2e74459c.tar.lz
nixlib-cfa4e0ac149b186a8fc965814c3cac5b2e74459c.tar.xz
nixlib-cfa4e0ac149b186a8fc965814c3cac5b2e74459c.tar.zst
nixlib-cfa4e0ac149b186a8fc965814c3cac5b2e74459c.zip
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.
-rw-r--r--pkgs/development/compilers/openjdk/8.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 2cf3389d3fc6..e82f40fc089e 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 = [