Skip to content

Commit 9051b45

Browse files
committed
Merge pull request tjschuck#17 from luislavena/update-ruby-latest
Update Rubies to latest
2 parents 0442e7e + ef1fc97 commit 9051b45

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎bin/package_win32_fat_binary‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ cd '/vagrant'
1212
# passed in path of gem to be cross-compiled
1313
cd$1
1414

15-
base_version=${BASE_VERSION:-1.8.7-p374}
16-
cc_versions=${RUBY_CC_VERSION:-1.8.7:1.9.3:2.0.0:2.1.3}
15+
base_version=${BASE_VERSION:-1.9.3}
16+
cc_versions=${RUBY_CC_VERSION:-1.8.7:1.9.3:2.0.0:2.1.4}
1717

18-
#need to use 1.8.7 for fat-binaries (1.9.3 can't cross-build 1.8.7)
18+
#Use Ruby 1.9.3 as base to cross-compile to different versions
1919
rvm use $base_version
2020
bundle install
2121

2222
bundle exec rake clean
23-
bundle exec rake cross native gem RUBY_CC_VERSION=$cc_versions
23+
bundle exec rake cross native gem RUBY_CC_VERSION=$cc_versions RUBYOPT=

‎bin/prepare_xrubies‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ rake-compiler cross-ruby VERSION=1.8.7-p374 HOST=i586-mingw32msvc
2424

2525
# Build 1.9.3 using 1.9.3 as base
2626
rvm use 1.9.3
27-
rake-compiler cross-ruby VERSION=1.9.3-p547 HOST=i586-mingw32msvc
27+
rake-compiler cross-ruby VERSION=1.9.3-p550 HOST=i586-mingw32msvc
2828

2929
# Use all CPUs for building 2.0+
3030
export MAKE="make -j$(nproc)"
3131

3232
# Build Ruby 2.0.0
33-
rake-compiler cross-ruby VERSION=2.0.0-p576 HOST=i686-w64-mingw32 debugflags="-g"
33+
rake-compiler cross-ruby VERSION=2.0.0-p594 HOST=i686-w64-mingw32 debugflags="-g"
3434

3535
# Build x64 Ruby 2.0.0
36-
rake-compiler cross-ruby VERSION=2.0.0-p576 HOST=x86_64-w64-mingw32 debugflags="-g"
36+
rake-compiler cross-ruby VERSION=2.0.0-p594 HOST=x86_64-w64-mingw32 debugflags="-g"
3737

3838
# Build Ruby 2.1
39-
rake-compiler cross-ruby VERSION=2.1.3 HOST=i686-w64-mingw32 debugflags="-g"
39+
rake-compiler cross-ruby VERSION=2.1.4 HOST=i686-w64-mingw32 debugflags="-g"
4040

4141
# Build x64 Ruby 2.1
42-
rake-compiler cross-ruby VERSION=2.1.3 HOST=x86_64-w64-mingw32 debugflags="-g"
42+
rake-compiler cross-ruby VERSION=2.1.4 HOST=x86_64-w64-mingw32 debugflags="-g"
4343

4444
# Mark installation prepared and don't run all this again
4545
touch "$HOME/.rake-compiler/.prepared"

0 commit comments

Comments
(0)