[Truffle] Fixed absolute paths to the JRuby bin in jruby+truffle.

jruby · Oct 5, 2015 · 7a19cab · eregon · Oct 6, 2015 · nirvdrum
1 parent 82db605
commit 7a19cab
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb b/tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb
@@ -294,8 +294,13 @@ def subcommand_setup(vm_options, rest)
   end
 
   def subcommand_run(vm_options, rest)
-    jruby_path = Pathname("#{@options[:global][:jruby_truffle_path]}/../..").
-        relative_path_from(Pathname('.')).to_s
+    jruby_path = Pathname("#{@options[:global][:jruby_truffle_path]}/../..")
+
+    unless jruby_path.absolute?
+      jruby_path = jruby_path.relative_path_from(Pathname('.'))
+    end
+
+    jruby_path = jruby_path.to_s
 
     if @options[:run][:build] || @options[:run][:rebuild]
       Dir.chdir jruby_path do