scripts/ruby-installer in rvm-0.0.74 vs scripts/ruby-installer in rvm-0.0.75
- old
+ new
@@ -74,11 +74,11 @@
fi
cd $rvm_ruby_src_path
if [[ $? -gt 0 ]] ; then result=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
- if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
+ if [[ -z "$rvm_ruby_configure" ]] && [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
rvm_autoconf="$(which autoconf)"
if [[ $? -gt 0 ]] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
__rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
# if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
fi
@@ -124,10 +124,11 @@
case "$rvm_ruby_interpreter" in
macruby)
if [[ "Darwin" = "$(uname)" ]] ; then
if [[ "$rvm_head_flag" = 1 ]] ; then
+ __rvm_install_llvm
macruby_path="/usr/local/bin"
# TODO: configure & make variables should be set here.
rvm_ruby_configure=" true "
rvm_ruby_make="rake"
rvm_ruby_make_install="sudo rake install"
@@ -644,8 +645,20 @@
__rvm_actual_file() {
if [[ -L $1 ]] ; then # If the file is a symlink,
actual_file="$(readlink $1)" # read the link target so we can preserve it.
else
actual_file="$1"
+ fi
+}
+
+__rvm_install_llvm() {
+ cd "$rvm_src_path"
+ if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
+ rm -rf "$rvm_src_path/llvm"
+ svn co -r 82747 https://llvm.org/svn/llvm-project/llvm/trunk llvm
+ cd "$rvm_src_path/llvm"
+ ./configure --enable-bindings=none
+ UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2
+ sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
fi
}