diff options
| author | David RodrÃguez <[email protected]> | 2025-01-21 17:21:55 +0100 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2025-01-28 15:31:53 +0900 |
| commit | d8394461fd11df51cb743b4bb4d156d6cf6b0131 (patch) | |
| tree | da79b07f165f57de09d44031005b1fb701a25ed8 /lib | |
| parent | 47888801043e2c7ca8be03a5a5bbfae6cd1748b7 (diff) | |
[rubygems/rubygems] Support installing arm native gems on Windows
https://github.com/rubygems/rubygems/commit/96496e3f53
Co-authored-by: Johnny Shields <[email protected]>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/gem_helpers.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/rubygems_ext.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/bundler/gem_helpers.rb b/lib/bundler/gem_helpers.rb index 0e8cba0d99..ad12bf89a4 100644 --- a/lib/bundler/gem_helpers.rb +++ b/lib/bundler/gem_helpers.rb @@ -11,7 +11,7 @@ module Bundler def generic(p) GENERIC_CACHE[p] ||= begin found = GENERICS.find do |match| - p.os == match.os && (!match.cpu || p.cpu == match.cpu) + p === match end found || Gem::Platform::RUBY end diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index 6d4a8e5857..6d1d0768bc 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -67,7 +67,8 @@ module Gem MINGW = Gem::Platform.new("x86-mingw32") X64_MINGW = [Gem::Platform.new("x64-mingw32"), Gem::Platform.new("x64-mingw-ucrt")].freeze - WINDOWS = [MSWIN, MSWIN64, MINGW, X64_MINGW].flatten.freeze + UNIVERSAL_MINGW = Gem::Platform.new("universal-mingw") + WINDOWS = [MSWIN, MSWIN64, UNIVERSAL_MINGW].flatten.freeze X64_LINUX = Gem::Platform.new("x86_64-linux") X64_LINUX_MUSL = Gem::Platform.new("x86_64-linux-musl") |