From 26aff37466fa3226122c65f49f2b7663e6b2551b Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 23 Mar 2022 00:58:03 +0900
Subject: [PATCH] Need to reconfigure and rebuild everything when abi.h changed

---
 template/Makefile.in | 6 ++++--
 win32/Makefile.sub   | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/template/Makefile.in b/template/Makefile.in
index 892add75cb..54b32d05b3 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -266,6 +266,8 @@ DESTDIR       = @DESTDIR@
 configure_args = @configure_args@
 #### End of variables
 
+ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h
+
 .SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
 
 all:
@@ -354,7 +356,7 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
 
 Makefile:	$(srcdir)/template/Makefile.in $(srcdir)/enc/Makefile.in
 
-$(MKFILES): config.status $(srcdir)/version.h
+$(MKFILES): config.status $(srcdir)/version.h $(ABI_VERSION_HDR)
 		@[ -f $@ ] && mv $@ $@.old
 		MAKE=$(MAKE) $(SHELL) ./config.status $@
 		@cmp $@ $@.old > /dev/null 2>&1 && echo $@ unchanged && exit 0; \
@@ -376,7 +378,7 @@ reconfig-exec-0 = test -t 1 && { : $${CONFIGURE_TTY=yes}; export CONFIGURE_TTY;
 reconfig-exec-1 = set -x; "$$@"
 
 reconfig config.status:	$(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
-			$(srcdir)/include/ruby/version.h
+			$(hdrdir)/ruby/version.h $(ABI_VERSION_HDR)
 	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
 	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 95a9ef4508..063e6938d5 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -539,6 +539,8 @@ ACTIONS_GROUP = @:: $(empty)
 ACTIONS_ENDGROUP = @::
 !endif
 
+ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h
+
 !include $(srcdir)/common.mk
 
 !ifdef SCRIPTPROGRAMS
@@ -571,6 +573,7 @@ update-src::
 
 .PHONY: reconfig
 reconfig $(MKFILES): $(srcdir)/common.mk $(srcdir)/version.h \
+	    $(hdrdir)/ruby/version.h $(ABI_VERSION_HDR) \
 	    $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat \
 	    $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak \
 	    $(srcdir)/enc/Makefile.in