Skip to content

Commit

Permalink
Change CONFIGURE_OPTS
Browse files Browse the repository at this point in the history
 - Use CONFIGURE_OPTS as array
 - Check for both ruby-2.4 and ruby-2.5
  • Loading branch information
d-unsed committed Nov 30, 2017
1 parent 8daf3e6 commit 4628c2f
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,14 @@ ruby-*)
EXTRA_FLAGS="--rubygems ignore"
fi

if [[ $RUBY = ruby-2.4* ]]; then
EXTRA_CONFIGURE_OPTS=",--enable-install-static-library"
fi

announce rvm install $RUBY $EXTRA_FLAGS --verify-downloads 1 $MOVABLE_FLAG --disable-install-doc -C --without-tcl,--without-tk,--without-gmp$EXTRA_CONFIGURE_OPTS;;
CONFIGURE_OPTS_ARRAY=( --without-tcl --without-tk --without-gmp )
case $RUBY in
ruby-2.4*|ruby-2.5*)
CONFIGURE_OPTS_ARRAY+=( --enable-install-static-library );;
esac

CONFIGURE_OPTS=$( IFS=','; echo "${CONFIGURE_OPTS_ARRAY[*]}" )
announce rvm install $RUBY $EXTRA_FLAGS --verify-downloads 1 $MOVABLE_FLAG --disable-install-doc -C $CONFIGURE_OPTS;;
jruby-head)
update_mvn 3.3.9
announce rvm install $RUBY --verify-downloads 1;;
Expand Down

0 comments on commit 4628c2f

Please sign in to comment.