diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-18 09:31:32 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-18 09:31:32 +0000 |
| commit | 17aeff3e77e6fe0d37a9943dd93bcb16c4bb9f66 (patch) | |
| tree | 8b69e5daaf8c96a8b69e68123c1fb448edba3543 /tool | |
| parent | c4e832bf6fa605234afee1fa91f0df93bc1a31c8 (diff) | |
make-snapshot: get rid of circular dependency
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/make-snapshot | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 9bccecaf26..4a57e072e3 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -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 |