Fix universal gem installation

rubygems · Apr 11, 2015 · bd078f2 · bd078f2
1 parent 442d576
commit bd078f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/bundler/gem_helpers.rb b/lib/bundler/gem_helpers.rb
@@ -6,6 +6,7 @@ module GemHelpers
       [Gem::Platform.new('java'), Gem::Platform.new('java')],
       [Gem::Platform.new('mswin32'), Gem::Platform.new('mswin32')],
       [Gem::Platform.new('mswin64'), Gem::Platform.new('mswin64')],
+      [Gem::Platform.new('universal-mingw32'), Gem::Platform.new('universal-mingw32')],
       [Gem::Platform.new('x64-mingw32'), Gem::Platform.new('x64-mingw32')],
       [Gem::Platform.new('x86_64-mingw32'), Gem::Platform.new('x64-mingw32')],
       [Gem::Platform.new('mingw32'), Gem::Platform.new('x86-mingw32')]

diff --git a/lib/bundler/match_platform.rb b/lib/bundler/match_platform.rb
@@ -7,7 +7,8 @@ module MatchPlatform
     def match_platform(p)
       Gem::Platform::RUBY == platform or
       platform.nil? or p == platform or
-      generic(Gem::Platform.new(platform)) == p
+      generic(Gem::Platform.new(platform)) == p or
+      platform === p
     end
   end
 end