diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-11-04 11:23:51 -0500 |
|---|---|---|
| committer | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2018-11-04 16:25:51 +0000 |
| commit | 23deb67b7c0862521382e9814d304c434495c0e1 (patch) | |
| tree | 28da215015e715f17e817bcfa75964e0c1aaeca5 /pkgs/development | |
| parent | 7bd773832c93d3fae33676d8567eb295d547465e (diff) | |
| download | nixlib-23deb67b7c0862521382e9814d304c434495c0e1.tar nixlib-23deb67b7c0862521382e9814d304c434495c0e1.tar.gz nixlib-23deb67b7c0862521382e9814d304c434495c0e1.tar.bz2 nixlib-23deb67b7c0862521382e9814d304c434495c0e1.tar.lz nixlib-23deb67b7c0862521382e9814d304c434495c0e1.tar.xz nixlib-23deb67b7c0862521382e9814d304c434495c0e1.tar.zst nixlib-23deb67b7c0862521382e9814d304c434495c0e1.zip | |
graalvm: More fixes
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/graalvm/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
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.h>' '<${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 |