From 23deb67b7c0862521382e9814d304c434495c0e1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 4 Nov 2018 11:23:51 -0500 Subject: graalvm: More fixes --- pkgs/development/compilers/graalvm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 37c23e81b426..a35143b43496 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -183,6 +183,11 @@ in rec { --replace '' '<${zlib.dev}/include/zlib.h>' substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \ --replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");' + substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \ + --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \ + 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");' + substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \ + --replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";' ''; buildPhase = '' # make a copy of jvmci8 -- cgit 1.4.1