summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 16:18:01 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 16:18:01 +0000
commit9f69bef99bdaf542e3cc93215bcf5e1dbba1b91b (patch)
treefb923e7264a6566273dda4f8f86e61dd53fa56aa
parenta1a5c879f74720d729f1c6f5db994ad0d2905345 (diff)
* tool/make-snapshot: add --disable-rubygem to both MINIRUBY and RUBY.
On making miniprelude.c, it seems use MINIRUBY. this fixes #7541 but rubygems also needs to be fixed for older rubies. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rwxr-xr-xtool/make-snapshot8
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0da431bb0e..424a6a126f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 12 01:05:04 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/make-snapshot: add --disable-rubygem to both MINIRUBY and RUBY.
+ On making miniprelude.c, it seems use MINIRUBY. this fixes #7541
+ but rubygems also needs to be fixed for older rubies.
+
Wed Dec 12 00:32:11 2012 Naohisa Goto <ngotogenome@gmail.com>
* test/dl/test_func.rb (test_name_with_block, test_bind, test_qsort1):
diff --git a/tool/make-snapshot b/tool/make-snapshot
index cc4bc711f9..971dfd861e 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -69,9 +69,11 @@ path = ENV["PATH"].split(File::PATH_SEPARATOR)
end
end
-`#{ENV["BASERUBY"]} --disable-gem -e1 2>&1`
-if $?.success?
- ENV["BASERUBY"] += ' --disable-gems'
+%w[BASERUBY RUBY MINIRUBY].each do |var|
+ `#{ENV[var]} --disable-gem -e1 2>&1`
+ if $?.success?
+ ENV[var] += ' --disable-gem'
+ end
end
if $help or $_help