Skip to content

Commit 26aff37

Browse files
committed
Need to reconfigure and rebuild everything when abi.h changed
1 parent 2b01d7f commit 26aff37

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

template/Makefile.in

+4-2
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ DESTDIR = @DESTDIR@
266266
configure_args = @configure_args@
267267
#### End of variables
268268

269+
ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h
270+
269271
.SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
270272

271273
all:
@@ -354,7 +356,7 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
354356

355357
Makefile: $(srcdir)/template/Makefile.in $(srcdir)/enc/Makefile.in
356358

357-
$(MKFILES): config.status $(srcdir)/version.h
359+
$(MKFILES): config.status $(srcdir)/version.h $(ABI_VERSION_HDR)
358360
@[ -f $@ ] && mv $@ $@.old
359361
MAKE=$(MAKE) $(SHELL) ./config.status $@
360362
@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;
376378
reconfig-exec-1 = set -x; "$$@"
377379

378380
reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
379-
$(srcdir)/include/ruby/version.h
381+
$(hdrdir)/ruby/version.h $(ABI_VERSION_HDR)
380382
@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
381383
set $(SHELL) $($@-args); $(reconfig-exec-$(V))
382384

win32/Makefile.sub

+3
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,8 @@ ACTIONS_GROUP = @:: $(empty)
539539
ACTIONS_ENDGROUP = @::
540540
!endif
541541

542+
ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h
543+
542544
!include $(srcdir)/common.mk
543545

544546
!ifdef SCRIPTPROGRAMS
@@ -571,6 +573,7 @@ update-src::
571573

572574
.PHONY: reconfig
573575
reconfig $(MKFILES): $(srcdir)/common.mk $(srcdir)/version.h \
576+
$(hdrdir)/ruby/version.h $(ABI_VERSION_HDR) \
574577
$(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat \
575578
$(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak \
576579
$(srcdir)/enc/Makefile.in

0 commit comments

Comments
 (0)