ruby-installer in rvm-0.0.79

- old
+ new

@@ -118,11 +118,10 @@
 
 __rvm_install_ruby() {
 
   if [[ -z "$rvm_ruby_selected_flag" ]]  ; then __rvm_select $* ; fi
   if [[ ! -z "$RUBYOPT" ]]     ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
-  __rvm_make_flags
 
   case "$rvm_ruby_interpreter" in
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
         if [[ "$rvm_head_flag" = 1 ]] ; then
@@ -139,11 +138,11 @@
           macruby_path="/usr/local/bin"
           # TODO: Separated nightly from head.
           rvm_url="$(__rvm_db "macruby_nightly_url")"
           __rvm_log "info" "Retrieving the latest nightly macruby build..."
           __rvm_fetch "$rvm_url"
-          mv "$rvm_archives_path/latest" "$rvm_archives_path/macruby_nightly.pkg"
+          mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
           __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_path/archives/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         fi
 
         binaries="erb gem irb rake rdoc ri ruby testrb" # Trick to work in more shells :)
@@ -223,20 +222,22 @@
         if [[ -z "$rvm_url" ]] ; then
           __rvm_log "fail" "rvm does not know the rvm repo url for 'ree_${rvm_ruby_version}'"
           result=1
         else
           rvm_ruby_repo_url=$rvm_url
+          __rvm_make_flags
           __rvm_install_source $*
         fi
       fi
     ;;
 
     rbx|rubinius)
       __rvm_log "info" "Installing pre-requisites"
       # prereqs, 1.8.6+ + rake. Yes this could all be one line... not pushing our luck.
       echo "$(export rvm_install_on_use_flag=1 ; rvm 1.8.7)" # This should install if missing.
       # TODO: use 'rvm gems load' here:
+      unset CFLAGS LDFLAGS ARCHFLAGS # Important.
       __rvm_unset_ruby_variables ; rvm_ruby_string="rbx-head" ; __rvm_select
 
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
@@ -400,10 +401,11 @@
         __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
       done ; unset rvm_gem_name
     ;;
 
     mput|shyouhei)
+      __rvm_make_flags
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       rvm_ruby_repo_url=$rvm_shyouhei_repo_url
@@ -461,9 +463,10 @@
       __rvm_post_install
       __rvm_pushpop
     ;;
 
     ruby)
+      __rvm_make_flags
       __rvm_install_source $*
     ;;
 
     default)
       __rvm_log "fail" "must specify a ruby interpreter to install."