2 files changed, 7 insertions, 2 deletions
diff --git a/railties/lib/rails/gem_builder.rb b/railties/lib/rails/gem_builder.rb
index 629726a5c6..e7e06d0008 100644
--- a/railties/lib/rails/gem_builder.rb
+++ b/railties/lib/rails/gem_builder.rb
@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'rubygems/installer'
 
 module Rails
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 8d6a748e4c..0b2e6eb93d 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -14,8 +14,7 @@ module Rails
       end
       @lib      = options[:lib]
       @source   = options[:source]
-      @loaded   = false
-      @load_paths_added = false
+      @loaded   = @frozen = @load_paths_added = false
       @unpack_directory = nil
     end
 
@@ -28,6 +27,7 @@ module Rails
         gem *args
       else
         $LOAD_PATH << File.join(unpacked_paths.first, 'lib')
+        @frozen = true
       end
       @load_paths_added = true
     rescue Gem::LoadError
@@ -47,6 +47,10 @@ module Rails
       $!.backtrace.each { |b| puts b }
     end
 
+    def frozen?
+      @frozen
+    end
+
     def loaded?
       @loaded
     end