scripts/ruby-installer in rvm-0.0.60 vs scripts/ruby-installer in rvm-0.0.61

- old
+ new

@@ -78,16 +78,10 @@ fi if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then __rvm_log "debug" "Skipping configure step, Makefile exists so configure must have already been run." elif [ -s ./configure ] ; then - if [ -d "$rvm_path/usr/include/readline/" ] ; then - configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/" - fi - if [ -d "$rvm_path/usr/include/iconv/" ] ; then - configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/" - fi __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..." if [ $? -gt 0 ] ; then result=$? ; return $result ; fi unset configure_parameters elif [ ! -z "rvm_ruby_configure" ] ; then $rvm_ruby_configure @@ -117,11 +111,11 @@ function __rvm_install_ruby { if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi if [ ! -z "$RUBYOPT" ] ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi - if [ "$(uname)" = "Darwin" ] ; then ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS ; fi + __rvm_make_flags case "$rvm_ruby_interpreter" in macruby) if [ "$(uname)" = "Darwin" ] ; then rvm_url="$(__rvm_db "macruby_nightly_url")" @@ -154,10 +148,10 @@ cd "$rvm_ruby_src_path" mkdir -p "$rvm_ruby_log_path" mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems" if [ ! -z "$rvm_ruby_configure" ] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi - __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..." + __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems $rvm_ruby_configure" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..." # --no-tcmalloc if [ $? -gt 0 ] ; then result=$? ; return $result ; fi chmod +x $rvm_ruby_home/bin/* __rvm_rubygems_setup