Skip to content

Commit 4628c2f

Browse files
committed
Change CONFIGURE_OPTS
- Use CONFIGURE_OPTS as array - Check for both ruby-2.4 and ruby-2.5
1 parent 8daf3e6 commit 4628c2f

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

build.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,14 @@ ruby-*)
201201
EXTRA_FLAGS="--rubygems ignore"
202202
fi
203203

204-
if [[ $RUBY = ruby-2.4* ]]; then
205-
EXTRA_CONFIGURE_OPTS=",--enable-install-static-library"
206-
fi
207-
208-
announce rvm install $RUBY $EXTRA_FLAGS --verify-downloads 1 $MOVABLE_FLAG --disable-install-doc -C --without-tcl,--without-tk,--without-gmp$EXTRA_CONFIGURE_OPTS;;
204+
CONFIGURE_OPTS_ARRAY=( --without-tcl --without-tk --without-gmp )
205+
case $RUBY in
206+
ruby-2.4*|ruby-2.5*)
207+
CONFIGURE_OPTS_ARRAY+=( --enable-install-static-library );;
208+
esac
209+
210+
CONFIGURE_OPTS=$( IFS=','; echo "${CONFIGURE_OPTS_ARRAY[*]}" )
211+
announce rvm install $RUBY $EXTRA_FLAGS --verify-downloads 1 $MOVABLE_FLAG --disable-install-doc -C $CONFIGURE_OPTS;;
209212
jruby-head)
210213
update_mvn 3.3.9
211214
announce rvm install $RUBY --verify-downloads 1;;

0 commit comments

Comments
 (0)