Merge branch 'rbx-ruby-18'

bin/ruby-build

@@ -445,7 +445,7 @@ build_package_rbx() {
   local package_name="$1"
 
   { bundle --path=vendor/bundle
-    ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS
+    RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS
     rake install
     fix_rbx_gem_binstubs "$PREFIX_PATH"
   } >&4 2>&1

test/build.bats

@@ -27,7 +27,7 @@ tarball() {
   mkdir -p "$path"
   cat > "$configure" <<OUT
 #!$BASH
-echo "$name: \$@" >> build.log
+echo "$name: \$@" \${RUBYOPT:+RUBYOPT=\$RUBYOPT} >> build.log
 OUT
   chmod +x "$configure"
 
@@ -259,7 +259,7 @@ DEF
 
   assert_build_log <<OUT
 bundle --path=vendor/bundle
-rubinius-2.0.0: --prefix=$INSTALL_ROOT
+rubinius-2.0.0: --prefix=$INSTALL_ROOT RUBYOPT=-rubygems
 bundle exec rake install
 OUT
 }