about summary refs log tree commit diff
path: root/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch
diff options
context:
space:
mode:
authorhlolli <hlolli@gmail.com>2020-01-18 16:43:03 +0100
committerhlolli <hlolli@gmail.com>2020-01-18 16:43:03 +0100
commit78b34b5e5bd8e36f67a6fcd0254b174423c2ebdd (patch)
tree3034b37e04575156f30008da4e124330143cb31a /pkgs/development/compilers/graalvm/005_tool_jt.rb.patch
parentba889bdcbe0681b1c83c4cd9d06613ca9f87b6e8 (diff)
downloadnixlib-78b34b5e5bd8e36f67a6fcd0254b174423c2ebdd.tar
nixlib-78b34b5e5bd8e36f67a6fcd0254b174423c2ebdd.tar.gz
nixlib-78b34b5e5bd8e36f67a6fcd0254b174423c2ebdd.tar.bz2
nixlib-78b34b5e5bd8e36f67a6fcd0254b174423c2ebdd.tar.lz
nixlib-78b34b5e5bd8e36f67a6fcd0254b174423c2ebdd.tar.xz
nixlib-78b34b5e5bd8e36f67a6fcd0254b174423c2ebdd.tar.zst
nixlib-78b34b5e5bd8e36f67a6fcd0254b174423c2ebdd.zip
graalvm8: 19.1.1 -> 19.2.1
- - nixpkgs now with full darwin support
Diffstat (limited to 'pkgs/development/compilers/graalvm/005_tool_jt.rb.patch')
-rw-r--r--pkgs/development/compilers/graalvm/005_tool_jt.rb.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch b/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch
new file mode 100644
index 000000000000..06f693db9f63
--- /dev/null
+++ b/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch
@@ -0,0 +1,46 @@
+diff --git a/tool/jt.rb b/tool/jt.rb
+index 870d88edcb..0a6e4c367b 100755
+--- a/tool/jt.rb
++++ b/tool/jt.rb
+@@ -152,13 +152,16 @@ module Utilities
+   end
+ 
+   def find_mx
+-    if which('mx')
+-      'mx'
++    if ENV.key?("MX_GIT_CACHE_DIR")
++      "mx-internal"
+     else
+-      mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git")
+-      "#{mx_repo}/mx"
++      if which('mx')
++        'mx'
++      else
++        mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git")
++        "#{mx_repo}/mx"
++      end
+     end
+-  end
+ 
+   def find_launcher(use_native)
+     if use_native
+@@ -444,8 +447,8 @@ module Commands
+           --no-sforceimports                         do not run sforceimports before building
+           parser                                     build the parser
+           options                                    build the options
+-          graalvm                                    build a minimal JVM-only GraalVM containing only TruffleRuby, 
+-                                                     available by default in mxbuild/truffleruby-jvm, 
++          graalvm                                    build a minimal JVM-only GraalVM containing only TruffleRuby,
++                                                     available by default in mxbuild/truffleruby-jvm,
+                                                      the Ruby is symlinked into rbenv or chruby if available
+               --graal      include the GraalVM Compiler in the build
+               --native     build native ruby image as well, available in mxbuild/truffleruby-native
+@@ -491,7 +494,7 @@ module Commands
+       jt test compiler                               run compiler tests
+       jt test integration [TESTS]                    run integration tests
+       jt test bundle [--jdebug]                      tests using bundler
+-      jt test gems [TESTS]                           tests using gems 
++      jt test gems [TESTS]                           tests using gems
+       jt test ecosystem [TESTS]                      tests using the wider ecosystem such as bundler, Rails, etc
+       jt test cexts [--no-openssl] [--no-gems] [test_names...]
+                                                      run C extension tests (set GEM_HOME)