mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
make-snapshot: get rid of circular dependency
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c4e832bf6f
commit
17aeff3e77
1 changed files with 2 additions and 3 deletions
|
@ -408,7 +408,7 @@ def package(vcs, rev, destdir, tmp = nil)
|
|||
mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "")
|
||||
mk << <<-'APPEND'
|
||||
|
||||
prereq: clean-cache $(CLEAN_CACHE)
|
||||
prepare-package: prereq update-download clean-cache $(CLEAN_CACHE)
|
||||
clean-cache $(CLEAN_CACHE): after-update
|
||||
touch-unicode-files: _touch-unicode-files
|
||||
update-download:: touch-unicode-files
|
||||
|
@ -421,11 +421,10 @@ _touch-unicode-files:
|
|||
touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
|
||||
APPEND
|
||||
open(clean.add("Makefile"), "w") do |f|
|
||||
f.puts "prereq: update-download"
|
||||
f.puts mk
|
||||
end
|
||||
ENV["CACHE_SAVE"] = "no"
|
||||
system(ENV["MAKE"] || ENV["make"] || "make", "prereq", *args.map {|arg| arg.join("=")})
|
||||
system(ENV["MAKE"] || ENV["make"] || "make", "prepare-package", *args.map {|arg| arg.join("=")})
|
||||
clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk")
|
||||
print "prerequisites"
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue