summaryrefslogtreecommitdiff
path: root/tool/make-snapshot
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-25 07:44:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-25 07:44:58 +0000
commit8d4321346722326acb2bb87e9cc7ea2a3af6c355 (patch)
tree63a6994c989bd6991ba76113473a6d279eafb8c7 /tool/make-snapshot
parentcfa98ab2eb845e22f8fdc34ef32d0cc67e6a586e (diff)
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
Diffstat (limited to 'tool/make-snapshot')
-rwxr-xr-xtool/make-snapshot5
1 files changed, 3 insertions, 2 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index b583efc..865fdeb 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