diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-08-05 16:16:34 +0200 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2022-08-23 05:50:23 +0900 |
commit | 59f27445eaf1f28b4c9769bbfd13e3a4bffa17da (patch) | |
tree | 27bc926ae6e22ab74e9ff0c7b29ff73673b20cb2 /lib | |
parent | 492e70c7b4303ffea8f8c07797e1696b90ce1d01 (diff) | |
download | ruby-59f27445eaf1f28b4c9769bbfd13e3a4bffa17da.tar.gz |
[rubygems/rubygems] Implement extra rules for libc versioning
https://github.com/rubygems/rubygems/commit/7e976d790a
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rubygems/platform.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb index 78fff703a2..8c5e7993ca 100644 --- a/lib/rubygems/platform.rb +++ b/lib/rubygems/platform.rb @@ -102,7 +102,7 @@ class Gem::Platform when /^dalvik(\d+)?$/ then [ "dalvik", $1 ] when /^dotnet$/ then [ "dotnet", nil ] when /^dotnet([\d.]*)/ then [ "dotnet", $1 ] - when /linux-?((?!gnu)\w+)?/ then [ "linux", $1 ] + when /linux-?(\w+)?/ then [ "linux", $1 ] when /mingw32/ then [ "mingw32", nil ] when /mingw-?(\w+)?/ then [ "mingw", $1 ] when /(mswin\d+)(\_(\d+))?/ then @@ -180,7 +180,7 @@ class Gem::Platform # version ( (@os != "linux" && (@version.nil? || other.version.nil?)) || - (@os == "linux" && (@version.nil? && !other.version.nil?)) || + (@os == "linux" && ((@version.nil? && ["gnu", "musl"].include?(other.version)) || (@version == "gnu" && other.version.nil?))) || @version == other.version ) end |