summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-03-25 17:01:50 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-03-25 17:10:53 +0900
commite7dc6f2a3cee7e64272988e23e6eb3a4b03a1608 (patch)
treee9f5557c8fa93bd46d51237af7dd660b98a64e77 /common.mk
parentcda60ee6d5e63b90412c4be87040602e9293751a (diff)
Generate encoding header before enc.mk
As some encodings need the corresponding header.
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 98e1902d7d..f3df20d0be 100644
--- a/common.mk
+++ b/common.mk
@@ -858,9 +858,10 @@ encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP
libenc enc: {$(VPATH)}encdb.h
libtrans trans: {$(VPATH)}transdb.h
+ENC_HEADERS = $(srcdir)/enc/jis/props.h
# Use MINIRUBY which loads fake.rb for cross compiling
$(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
- $(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake
+ $(srcdir)/enc/encinit.c.erb $(ENC_HEADERS) $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake
$(ECHO) generating $@
$(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $(ENCS) $@
@@ -1074,7 +1075,7 @@ all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h
incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
{$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \
$(REVISION_H) \
- $(UNICODE_DATA_HEADERS) $(srcdir)/enc/jis/props.h \
+ $(UNICODE_DATA_HEADERS) $(ENC_HEADERS) \
{$(VPATH)}id.h {$(VPATH)}probes.dmyh
insns: $(INSNS)