Merge branch 'master' of git://github.com/rails/rails

2 files changed, 9 insertions, 8 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index cd23158e98..560105670f 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -125,11 +125,8 @@ module Rails
     if Rails.vendor_rails?
       begin; require "rubygems"; rescue LoadError; return; end
 
-      stubs = %w(rails activesupport activerecord actionpack actionmailer activeresource)
-      stubs.reject! { |s| Gem.loaded_specs.key?(s) }
-
-      stubs.each do |stub|
-        Gem.loaded_specs[stub] = Gem::Specification.new do |s|
+      %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub|
+        Gem.loaded_specs[stub] ||= Gem::Specification.new do |s|
           s.name = stub
           s.version = Rails::VERSION::STRING
           s.loaded_from = ""
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 3cc75494e4..06d830ba24 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -122,10 +122,14 @@ module Rails
 
     def built?
       return false unless frozen?
-      specification.extensions.each do |ext|
-        makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
-        return false unless File.exists?(makefile)
+
+      if vendor_gem?
+        specification.extensions.each do |ext|
+          makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
+          return false unless File.exists?(makefile)
+        end
       end
+
       true
     end