nobu	2015-03-25 16:44:58 +0900 (Wed, 25 Mar 2015)

  New Revision: 50087

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50087

  Log:
    make-snapshot: override rest variables
    
    * tool/make-snapshot (package): override variables which are not
      substituted by the command line.

  Modified files:
    trunk/tool/make-snapshot
Index: tool/make-snapshot
===================================================================
--- tool/make-snapshot	(revision 50086)
+++ tool/make-snapshot	(revision 50087)
@@ -308,7 +308,8 @@ def package(vcs, rev, destdir, tmp = nil https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L308
         "PWD"=>Dir.pwd,
         "CONFIGURE"=>"configure",
       }
-      mk.gsub!(/@([A-Za-z_]\w*)@/) {vars[$1] || ENV[$1]}
+      args = vars.dup
+      mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
       mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "")
       mk << <<-'APPEND'
 
@@ -320,7 +321,7 @@ extract-gems: https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L321
       open(clean.add("Makefile"), "w") do |f|
         f.puts mk
       end
-      system("make", "prereq")
+      system("make", "prereq", *args.map {|arg| arg.join("=")})
       clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk")
       print "prerequisites"
     else

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/