Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bugfix: nailgun now compiles for jruby.

  • Loading branch information...
commit 866cb6e49551a3c8f7591dc6cd0ef7134af21ab5 1 parent b230422
@wayneeseguin wayneeseguin authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 scripts/manage
View
6 scripts/manage
@@ -294,6 +294,10 @@ RubyWrapper
;;
jruby)
+ if [[ -z "$(which java 2>/dev/null)" ]] ; then
+ echo -e "java must be installed and in your path in order to install JRuby." ; return 1
+ fi
+
mkdir -p "$rvm_ruby_log_path" "$rvm_ruby_src_path"
__rvm_pushpop $rvm_src_path
@@ -307,7 +311,7 @@ RubyWrapper
if [[ "$rvm_head_flag" -eq 1 ]] || [[ ! -z "$rvm_ruby_revision" ]] ; then ant dist ; fi
mkdir -p "$rvm_ruby_home/bin/"
- builtin cd "$rvm_ruby_src_path/tool/nailgun" && /usr/bin/make $rvm_make_flags
+ __rvm_run "nailgun" "builtin cd "$rvm_ruby_src_path/tool/nailgun" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags"
__rvm_pushpop
Please sign in to comment.
Something went wrong with that request. Please try again.