Merge branch 'rbx-llvm-fix'

Closes #664, closes #682

bin/ruby-build

@@ -798,7 +798,28 @@ require_llvm() {
   local llvm_version="$1"
   if [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then
     if [[ "$RUBY_CONFIGURE_OPTS" != *--llvm-* ]]; then
-      package_option ruby configure --prebuilt-name="llvm-3.2-x86_64-apple-darwin13.tar.bz2"
+      if [ "$llvm_version" = "3.2" ]; then
+        package_option ruby configure --prebuilt-name="llvm-3.2-x86_64-apple-darwin13.tar.bz2"
+      else
+        local llvm_prefix="$(brew --prefix llvm 2>/dev/null || true)"
+        local llvm_config="${llvm_prefix}/bin/llvm-config"
+        if [ -x "$llvm_config" ]; then
+          package_option ruby configure --llvm-config="$llvm_config"
+        else
+          { echo
+            colorize 1 "ERROR"
+            echo ": Rubinius will not be able to compile using Apple's LLVM-based "
+            echo "build tools on OS X. You will need to install LLVM 3.5 first."
+            echo
+            colorize 1 "TO FIX THE PROBLEM"
+            echo ": Install Homebrew's llvm package with this"
+            echo -n "command: "
+            colorize 4 "brew install llvm"
+            echo
+          } >&3
+          return 1
+        fi
+      fi
     fi
   fi
 }

share/ruby-build/rbx-2.0.0-dev

-require_llvm 3.4.2
+require_llvm 3.2
 install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749"
 install_git "rubinius-2.0.0-dev" "https://github.com/rubinius/rubinius.git" "master" rbx

share/ruby-build/rbx-2.3.0

+require_llvm 3.5
+install_package "rubinius-2.3.0" "http://releases.rubini.us/rubinius-2.3.0.tar.bz2#9953c3af5e9694540859eaf55164a38d0c32c3ad35457e4351d20c28a25fecaa" rbx

share/ruby-build/rbx-2.4.0

+require_llvm 3.5
+install_package "rubinius-2.4.0" "http://releases.rubini.us/rubinius-2.4.0.tar.bz2#89390e8dd890ac4b8ad931e6277714e3d55560ee2f236b756bb4f83ee26eb9b0" rbx

share/ruby-build/rbx-2.4.1

+require_llvm 3.5
+install_package "rubinius-2.4.1" "http://releases.rubini.us/rubinius-2.4.1.tar.bz2#a5967afe9f9305c08f97a22dd210922c33be79b293fc346f617ff31f280f136e" rbx