From ab8dbd1082ea88b27ceb1f28c101ce75afff8cad Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 9 Feb 2015 07:36:16 +0000
Subject: [PATCH] make-snapshot: no loading unexpected libraries

* tool/make-snapshot (package): get rid of loading unbundled and
  unexpected libraries.  [ruby-core:67977] [Bug #10822]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 tool/make-snapshot | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0843112342..3fdc393e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb  9 16:36:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): get rid of loading unbundled and
+	  unexpected libraries.  [ruby-core:67977] [Bug #10822]
+
 Sun Feb  8 20:09:37 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* lib/net/http/header.rb: pass header names as symbols.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 052ecf4721..afdcab088c 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -283,7 +283,10 @@ def package(vcs, rev, destdir, tmp = nil)
       }
       FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
       File.open("#{hdrdir}/config.h", "w") {}
-      miniruby = ENV['MINIRUBY'] + " -I. -rcross"
+      FileUtils.mkpath(defaults = "#{extout}/rubygems/defaults")
+      File.open("#{defaults}/operating_system.rb", "w") {}
+      File.open("#{defaults}/ruby.rb", "w") {}
+      miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross"
       mk = IO.read("Makefile.in").gsub(/^@.*\n/, '').gsub(/@([A-Za-z_]\w*)@/) {ENV[$1]}
       mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "")
       cmd = %W[make -f -