From 8d4321346722326acb2bb87e9cc7ea2a3af6c355 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 25 Mar 2015 07:44:58 +0000
Subject: [PATCH] make-snapshot: override rest variables

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

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

diff --git a/tool/make-snapshot b/tool/make-snapshot
index b583efca08..865fdeb965 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -308,7 +308,8 @@ def package(vcs, rev, destdir, tmp = nil)
         "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:
       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