diff options
author | Bo Anderson <mail@boanderson.me> | 2022-10-12 14:08:35 +0100 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2022-11-08 17:05:18 +0000 |
commit | 2244d5084e32fea801bff1060ef528769bebaa36 (patch) | |
tree | 205d86cb31b7c5c32a4bd4f1cf63f5464da37047 /lib/bundler/rubygems_ext.rb | |
parent | 3703a81491a16554674e4b15bac87efa3eb18f3b (diff) |
[rubygems/rubygems] Map 'universal' to the real arch in Bundler for prebuilt gem selection
https://github.com/rubygems/rubygems/commit/dd0c94f16a
Diffstat (limited to 'lib/bundler/rubygems_ext.rb')
-rw-r--r-- | lib/bundler/rubygems_ext.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index d53d688009..22cb797b5e 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -308,6 +308,28 @@ module Gem end end + # On universal Rubies, resolve the "universal" arch to the real CPU arch, without changing the extension directory. + class Specification + if /^universal\.(?<arch>.*?)-/ =~ RUBY_PLATFORM + local_platform = Platform.local + if local_platform.cpu == "universal" + ORIGINAL_LOCAL_PLATFORM = local_platform.to_s.freeze + + local_platform.cpu = if arch == "arm64e" # arm64e is only permitted for Apple system binaries + "arm64" + else + arch + end + + def extensions_dir + Gem.default_ext_dir_for(base_dir) || + File.join(base_dir, "extensions", ORIGINAL_LOCAL_PLATFORM, + Gem.extension_api_version) + end + end + end + end + require "rubygems/util" Util.singleton_class.module_eval do |