diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-04-09 16:03:32 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2015-04-10 20:23:02 -0700 |
| commit | bd078f22c3a9720f7d050c73039f53cca8ff90dd (patch) | |
| tree | e7756953a40e9aaa6dd1de09655c1a675c70a8c7 | |
| parent | 442d576a83f7e3324567fb93c43fc2b6da9074f1 (diff) | |
| download | bundler-bd078f22c3a9720f7d050c73039f53cca8ff90dd.tar.gz | |
Fix universal gem installation
| -rw-r--r-- | lib/bundler/gem_helpers.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/match_platform.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/bundler/gem_helpers.rb b/lib/bundler/gem_helpers.rb index a3bb514954..2af87c94d9 100644 --- a/lib/bundler/gem_helpers.rb +++ b/lib/bundler/gem_helpers.rb @@ -6,6 +6,7 @@ module Bundler [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 index 523dafbbd6..757f2c6af4 100644 --- a/lib/bundler/match_platform.rb +++ b/lib/bundler/match_platform.rb @@ -7,7 +7,8 @@ module Bundler 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 |