Merge bundler-2.2.0.rc.2

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 61bb648598..926c08c4c9 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -158,10 +158,10 @@ module Bundler
         # spec group.
         sg_ruby = sg.copy_for(Gem::Platform::RUBY)
         selected_sgs << sg_ruby if sg_ruby
-        sg_all_platforms = nil
         all_platforms = @platforms + [platform]
-        sorted_all_platforms = self.class.sort_platforms(all_platforms)
-        sorted_all_platforms.reverse_each do |other_platform|
+        next if all_platforms.to_a == [Gem::Platform::RUBY]
+        sg_all_platforms = nil
+        self.class.sort_platforms(all_platforms).reverse_each do |other_platform|
           if sg_all_platforms.nil?
             sg_all_platforms = sg.copy_for(other_platform)
           else
@@ -250,7 +250,7 @@ module Bundler
       ["00", *platform.to_a.map {|part| part || "" }]
     end
 
-  private
+    private
 
     # returns an integer \in (-\infty, 0]
     # a number closer to 0 means the dependency is less constraining