summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-12-11 22:28:47 +0000
committerKarl Berry <karl@freefriends.org>2021-12-11 22:28:47 +0000
commit13163d489272f9e15bb06bf07dd34e9ca04d3002 (patch)
treef23922af72322786cbb272afec488996ca8fd454
parent0eab0002cb46920e63573ae6c192102c14ae967c (diff)
try to depend on files generated from hiformat.w
git-svn-id: svn://tug.org/texlive/trunk@61279 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/hitexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/hitexdir/am/hitex.am7
2 files changed, 12 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/hitexdir/ChangeLog b/Build/source/texk/web2c/hitexdir/ChangeLog
index 6d08a28f770..47a628d7115 100644
--- a/Build/source/texk/web2c/hitexdir/ChangeLog
+++ b/Build/source/texk/web2c/hitexdir/ChangeLog
@@ -1,3 +1,11 @@
+2021-12-11 Karl Berry <karl@freefriends.org>
+
+ * am/hitex.am (hishrink_OBJECTS, hitex_OBJECTS): depend on
+ $(hiformat_c_h_l_y), so that (hopefully) ctangle is run on
+ hiformat.w to generate, e.g., hibasetypes.h before we try to
+ compile the programs. E.g.,
+ https://tug.org/pipermail/tlbuild/2021q4/004972.html
+
2021-11-16 Karl Berry <karl@freefriends.org>
* am/hitex.am: doc.
diff --git a/Build/source/texk/web2c/hitexdir/am/hitex.am b/Build/source/texk/web2c/hitexdir/am/hitex.am
index 9afaf561a73..a08b9600630 100644
--- a/Build/source/texk/web2c/hitexdir/am/hitex.am
+++ b/Build/source/texk/web2c/hitexdir/am/hitex.am
@@ -80,10 +80,11 @@ nodist_hishrink_SOURCES = hitables.c \
hitexdir/hiparser.c hitexdir/hiparser.h \
hishrink.c
-# This is our attempt to ensure that bison gets run before anything else,
-# when needed.
+# hitex and hishrink both need (at least) some of the sources generated
+# from hiformat.w.
#
-$(hishrink_OBJECTS): $(srcdir)/hitexdir/hiparser.h
+$(hitex_OBJECTS): $(hiformat_c_h_l_y)
+$(hishrink_OBJECTS): $(hiformat_c_h_l_y)
#
# By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
# this does not work for us, because we want to be able to invoke