Commit aa1a7a37 authored by Mislav Marohnić's avatar Mislav Marohnić Committed by GitHub
Browse files

Merge pull request #998 from eugeneius/rbx_llvm_36 

Require LLVM 3.6 when building Rubinius 3.30+
parents 12c34592 ac967182

bin/ruby-build

+4 −3
Original line number Diff line number Diff line
@@ -865,20 +865,21 @@ require_llvm() { 
      3.2 )

        package_option ruby configure --prebuilt-name="llvm-3.2-x86_64-apple-darwin13.tar.bz2"

        ;;

      3.5 )

      3.[56] )

        local llvm_config="$(locate_llvm "$llvm_version")"

        if [ -n "$llvm_config" ]; then

          package_option ruby configure --llvm-config="$llvm_config"

        else

          local homebrew_package="llvm${llvm_version//.}"

          { 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 "build tools on OS X. You will need to install LLVM $llvm_version first."

            echo

            colorize 1 "TO FIX THE PROBLEM"

            echo ": Install Homebrew's llvm package with this"

            echo -n "command: "

            colorize 4 "brew tap homebrew/versions ; brew install llvm35"

            colorize 4 "brew tap homebrew/versions ; brew install $homebrew_package"

            echo

          } >&3

          return 1

share/ruby-build/rbx-3.30

+1 −1
Original line number Diff line number Diff line 
require_llvm 3.5

require_llvm 3.6

install_package "openssl-1.0.2h" "https://www.openssl.org/source/openssl-1.0.2h.tar.gz#1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919" mac_openssl --if has_broken_mac_openssl

install_package "rubinius-3.30" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.30.tar.bz2#5294f406679d41160abe46ec1ff14b76c4353a75756227cc691108bb57f4bd16" rbx

share/ruby-build/rbx-3.31

+1 −1
Original line number Diff line number Diff line 
require_llvm 3.5

require_llvm 3.6

install_package "openssl-1.0.2h" "https://www.openssl.org/source/openssl-1.0.2h.tar.gz#1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919" mac_openssl --if has_broken_mac_openssl

install_package "rubinius-3.31" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.31.tar.bz2#1c7a7763ab7cf36ad6b2e328ff1d78fb6587721b8667f8598d15354d0704de72" rbx

share/ruby-build/rbx-3.32

+1 −1
Original line number Diff line number Diff line 
require_llvm 3.5

require_llvm 3.6

install_package "openssl-1.0.2h" "https://www.openssl.org/source/openssl-1.0.2h.tar.gz#1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919" mac_openssl --if has_broken_mac_openssl

install_package "rubinius-3.32" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.32.tar.bz2#f88d6d277efe1f9774da1201ce4c8a8fd7cb2ea29620c1727a4471e3a0eed1dc" rbx

share/ruby-build/rbx-3.33

+1 −1
Original line number Diff line number Diff line 
require_llvm 3.5

require_llvm 3.6

install_package "openssl-1.0.2h" "https://www.openssl.org/source/openssl-1.0.2h.tar.gz#1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919" mac_openssl --if has_broken_mac_openssl

install_package "rubinius-3.33" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.33.tar.bz2#1455940fc3a17b6efbb787c9316ff86a260187ebbaba6b32746dd27cebe14907" rbx