diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-04 12:11:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-04 12:11:53 +0000 |
| commit | 59a37c028317441b4a1e6d9a1e9c69570b347ee9 (patch) | |
| tree | ea34e1742b92e22be2dac58132e0206307eef780 | |
| parent | 6f015efc64aece0d25cc25686ea63dc8ffd7a340 (diff) | |
| download | ruby-59a37c028317441b4a1e6d9a1e9c69570b347ee9.tar.gz | |
gmake.mk: get rid of unicode normalization table timestamp
* common.mk, defs/gmake.mk: rid of unicode normalization tables
timestamp. update the target tables file only when only it
exists.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | defs/gmake.mk | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -1371,12 +1371,14 @@ touch-unicode-files: $(MAKEDIRS) $(UNICODE_SRC_DATA_DIR) touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS) +UNICODE_TABLES_TIMESTAMP = yes $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ $(srcdir)/template/unicode_norm_gen.tmpl \ $(ALWAYS_UPDATE_UNICODE:yes=update-unicode) $(Q) $(MAKE) $(@D) $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ - -c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \ + -c $(UNICODE_TABLES_TIMESTAMP:yes=-t$@) \ + -o $(srcdir)/lib/unicode_normalize/tables.rb \ -I $(srcdir) \ $(srcdir)/template/unicode_norm_gen.tmpl \ $(UNICODE_DATA_DIR) lib/unicode_normalize diff --git a/defs/gmake.mk b/defs/gmake.mk index eb9e35a446..496c5fe1fa 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -185,8 +185,13 @@ $(MJIT_MIN_HEADER): $(mjit_min_headers) $(PREP) endif -ifneq ($(wildcard $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)),) +ifeq ($(if $(wildcard $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)),,\ + $(wildcard $(srcdir)/lib/unicode_normalize/tables.rb)),) +# Needs the dependency when any Unicode data file exists, or +# normalization tables script doesn't. Otherwise, when the target +# only exists, use it as-is. .PHONY: $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time +UNICODE_TABLES_TIMESTAMP = $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: \ $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES) endif |