From 0a7a9a98c5e4a4d64890984e335a3d248fda3e42 Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Mon, 25 Jan 2021 15:04:50 +0900 Subject: [PATCH 1/2] Ruby: build extensions for arm64-darwin --- kokoro/release/ruby/macos/ruby/ruby_build_environment.sh | 9 ++++----- ruby/Rakefile | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh index 046b604b40..460af2c7fc 100755 --- a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh +++ b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh @@ -60,7 +60,8 @@ set -x ruby --version | grep 'ruby 2.7.0' for v in 3.0.0 2.7.0 ; do ccache -c - rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin11 MAKE="$MAKE" + rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE" + rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=arm64-darwin MAKE="$MAKE" done set +x rvm use 2.5.0 @@ -68,11 +69,9 @@ set -x ruby --version | grep 'ruby 2.5.0' for v in 2.6.0 2.5.1 2.4.0 2.3.0; do ccache -c - rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin11 MAKE="$MAKE" + rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE" + rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=arm64-darwin MAKE="$MAKE" done set +x rvm use 2.7.0 set -x - -sed 's/x86_64-darwin-11/universal-darwin/' ~/.rake-compiler/config.yml > "$CROSS_RUBY" -mv "$CROSS_RUBY" ~/.rake-compiler/config.yml diff --git a/ruby/Rakefile b/ruby/Rakefile index 3e3da055d3..2fd5288059 100644 --- a/ruby/Rakefile +++ b/ruby/Rakefile @@ -70,7 +70,7 @@ else ext.cross_platform = [ 'x86-mingw32', 'x64-mingw32', 'x86_64-linux', 'x86-linux', - 'universal-darwin' + 'x86_64-darwin', 'arm64-darwin', ] end From f2b5c33baff633f0dec7a6364e6c04efa16bc69a Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Wed, 29 Sep 2021 11:51:11 +0900 Subject: [PATCH 2/2] Specify aarch64 for older autotools --- kokoro/release/ruby/macos/ruby/ruby_build_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh index 460af2c7fc..9954fb0c2f 100755 --- a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh +++ b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh @@ -61,7 +61,7 @@ ruby --version | grep 'ruby 2.7.0' for v in 3.0.0 2.7.0 ; do ccache -c rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE" - rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=arm64-darwin MAKE="$MAKE" + rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE" done set +x rvm use 2.5.0 @@ -70,7 +70,7 @@ ruby --version | grep 'ruby 2.5.0' for v in 2.6.0 2.5.1 2.4.0 2.3.0; do ccache -c rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE" - rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=arm64-darwin MAKE="$MAKE" + rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE" done set +x rvm use 2.7.0