Merge RubyGems-3.3.18 and Bundler-2.3.18

This commit is contained in:
Hiroshi SHIBATA 2022-08-22 11:49:20 +09:00 committed by nagachika
parent 7ef68dd74a
commit 0918783347
69 changed files with 586 additions and 167 deletions

View file

@ -159,6 +159,10 @@ class Gem::Platform
def ===(other)
return nil unless Gem::Platform === other
# universal-mingw32 matches x64-mingw-ucrt
return true if (@cpu == 'universal' or other.cpu == 'universal') and
@os.start_with?('mingw') and other.os.start_with?('mingw')
# cpu
([nil,'universal'].include?(@cpu) or [nil, 'universal'].include?(other.cpu) or @cpu == other.cpu or
(@cpu == 'arm' and other.cpu.start_with?("arm"))) and