From a7b8741e44ed58d455e2d59e27ca3d1f8dc0c1c7 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 23 Mar 2017 15:47:26 +0000 Subject: common.mk: updating name2ctype.h * common.mk (name2ctype.h): update if ALWAYS_UPDATE_UNICODE = yes, as well as casefold.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 783505b68c..10558eca5e 100644 --- a/common.mk +++ b/common.mk @@ -1162,14 +1162,12 @@ $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ $(srcdir)/template/unicode_norm_gen.tmpl \ $(UNICODE_DATA_DIR) lib/unicode_normalize -# UPDATE_NAME2CTYPE= : toplevel -# UPDATE_NAME2CTYPE=yes : sub-make to update name2ctype.h -$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=.ignore.)name2ctype.h: - $(Q) $(MAKE) $(mflags) Q=$(Q) UPDATE_NAME2CTYPE=yes UNICODE_VERSION=$(UNICODE_VERSION) $@ - -$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=name2ctype.h): \ +$(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=name2ctype.h): \ $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ $(UNICODE_PROPERTY_FILES) + +$(UNICODE_HDR_DIR)/name2ctype.h: $(srcdir)/tool/enc-unicode.rb \ + $(ALWAYS_UPDATE_UNICODE:yes=update-unicode) $(MAKEDIRS) $(@D) $(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb --header $(UNICODE_SRC_DATA_DIR) > $@ @@ -1183,8 +1181,8 @@ $(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=casefold.h): \ $(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \ $(UNICODE_SRC_DATA_DIR)/CaseFolding.txt -$(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb - $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(mflags) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode +$(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \ + $(ALWAYS_UPDATE_UNICODE:yes=update-unicode) $(MAKEDIRS) $(@D) $(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \ --output-file=$@ \ -- cgit v1.2.3