summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 06:13:43 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 06:13:43 +0000
commit10c014b06d293314da37ec2171b3b20e64cbd670 (patch)
treef003f3730c17040c65ad6721f1eca3a3cb0e5b65
parent55058e3583a177ad86deef7c0128f777e4be0f24 (diff)
* tool/make-snapshot (BASERUBY): add --disable-gem to avoid load gems.
[Bug #7541] [ruby-core:50736] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/make-snapshot5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ee29d8e5c..c43acececa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 11 15:11:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/make-snapshot (BASERUBY): add --disable-gem to avoid load gems.
+ [Bug #7541] [ruby-core:50736]
+
Tue Dec 11 12:00:19 2012 NARUSE, Yui <naruse@ruby-lang.org>
* ext/dl/win32/extconf.rb: Fix typo
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 2368412260..cc4bc711f9 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -69,6 +69,11 @@ path = ENV["PATH"].split(File::PATH_SEPARATOR)
end
end
+`#{ENV["BASERUBY"]} --disable-gem -e1 2>&1`
+if $?.success?
+ ENV["BASERUBY"] += ' --disable-gems'
+end
+
if $help or $_help
puts usage
exit