mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2026-01-06 06:51:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1063 from rbenv/use-llvm-3.7

Browse source 
Fix instruction message and use llvm@3.7 for rbx build
This commit is contained in:
SHIBATA Hiroshi 2017-03-14 11:32:32 +09:00 • committed by GitHub
commit 4e80d996b1
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/ruby-build
View file

@ -872,7 +872,7 @@ require_llvm() {
if [ -n "$llvm_config" ]; then
package_option ruby configure --llvm-config="$llvm_config"
else
local homebrew_package="llvm${llvm_version//.}"
local homebrew_package="llvm@$llvm_version"
{ echo
colorize 1 "ERROR"
echo ": Rubinius will not be able to compile using Apple's LLVM-based "
@ -881,7 +881,7 @@ require_llvm() {
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 $homebrew_package"
colorize 4 "brew install $homebrew_package"
echo
} >&3
return 1

2
share/ruby-build/rbx-3.66
View file

@ -1,3 +1,3 @@
require_llvm 3.6
require_llvm 3.7
install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
install_package "rubinius-3.66" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.66.tar.bz2#4bb237a1da1d52bc830bbe704bd4b995bbc07e50b558e460aff54d6bc309975e" rbx

2
share/ruby-build/rbx-3.67
View file

@ -1,3 +1,3 @@
require_llvm 3.6
require_llvm 3.7
install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
install_package "rubinius-3.67" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.67.tar.bz2#a5eedd6169f80df528ac73cf2ed9183e2f5a82a57ca0b2ae3962c26238427b87" rbx

2
share/ruby-build/rbx-3.68
View file

@ -1,3 +1,3 @@
require_llvm 3.6
require_llvm 3.7
install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
install_package "rubinius-3.68" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.68.tar.bz2#44f423a8557aa8fa383573638a94faaf3f9c587a771be267c60ed0c78784f567" rbx

2
share/ruby-build/rbx-3.69
View file

@ -1,3 +1,3 @@
require_llvm 3.6
require_llvm 3.7
install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
install_package "rubinius-3.69" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.69.tar.bz2#2dcde5cb7ba1e1664f6bf902cd866d2564985536a0908caeac2e4099b6b255b2" rbx