Skip to content

Commit 48f84d8

Browse files
committed
Remove dump_ast from rbinc file dependencies
1 parent c091c18 commit 48f84d8

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

common.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1320,6 +1320,7 @@ preludes: {$(VPATH)}miniprelude.c
13201320

13211321
{$(srcdir)}.rb.$(HAVE_BASERUBY:yes=)rbinc:
13221322
$(ECHO) making $@
1323+
$(Q) $(DUMP_AST_TARGET)
13231324
$(Q) $(BASERUBY) $(tooldir)/mk_builtin_loader.rb $(DUMP_AST) $(SRC_FILE)
13241325

13251326
$(BUILTIN_BINARY:yes=built)in_binary.rbbin: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary.rbbin.tmpl
@@ -1330,7 +1331,7 @@ $(BUILTIN_BINARY:yes=built)in_binary.rbbin: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)
13301331
$(BUILTIN_BINARY:no=builtin)_binary.rbbin:
13311332
$(Q) echo> $@ // empty $(@F)
13321333

1333-
$(BUILTIN_RB_INCS): $(tooldir)/mk_builtin_loader.rb $(DUMP_AST_TARGET)
1334+
$(BUILTIN_RB_INCS): $(tooldir)/mk_builtin_loader.rb
13341335

13351336
dump_ast$(BUILD_EXEEXT): $(tooldir)/dump_ast.c $(LIBPRISM_OBJS)
13361337
$(ECHO) compiling $@

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ AC_ARG_WITH(dump-ast,
124124
], [
125125
DUMP_AST='./dump_ast$(BUILD_EXEEXT)'
126126
])
127-
DUMP_AST_TARGET='$(DUMP_AST)'])
127+
DUMP_AST_TARGET='$(MAKE) $(DUMP_AST)'])
128128
dnl Without baseruby, .rbinc files cannot be regenerated, so clear the
129129
dnl dependency on dump_ast to avoid rebuilding pre-generated .rbinc files.
130130
AS_IF([test "$HAVE_BASERUBY" = no], [DUMP_AST_TARGET='$(empty)'])

tool/prereq.status

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ s,@RUBY@,$(BASERUBY),g
3636
s,@RUNRUBY@,$(MINIRUBY),g
3737
s,@X_BUILD_EXEEXT@,,g
3838
s,@X_DUMP_AST@,build-tool/dump_ast$(BUILD_EXEEXT),g
39-
s,@X_DUMP_AST_TARGET@,$(DUMP_AST),g
39+
s,@X_DUMP_AST_TARGET@,$(MAKE) $(DUMP_AST),g
4040
s,@arch@,noarch,g
4141
s,@bindir@,,g
4242
s,@configure_args@,,g

win32/Makefile.sub

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h
563563
DUMP_AST_TARGET = $(empty)
564564
!else
565565
DUMP_AST = dump_ast$(BUILD_EXEEXT)
566-
DUMP_AST_TARGET = $(DUMP_AST)
566+
DUMP_AST_TARGET = $(MAKE) $(DUMP_AST)
567567
!endif
568568

569569
!include $(srcdir)/common.mk
@@ -1413,8 +1413,9 @@ loadpath: verconf.h
14131413
!if [exit > rbincs.mk]
14141414
!else if [for %I in ($(BUILTIN_RB_SRCS)) do \
14151415
@for %J in (\
1416-
"%~nI.rbinc: %I $$(tooldir)/mk_builtin_loader.rb $$(DUMP_AST_TARGET)" \
1416+
"%~nI.rbinc: %I $$(tooldir)/mk_builtin_loader.rb" \
14171417
" $$(ECHO) making $$@" \
1418+
" $(Q) $$(DUMP_AST_TARGET)" \
14181419
" $$(Q) $$(BASERUBY) $$(tooldir)/mk_builtin_loader.rb $$(DUMP_AST) %I" \
14191420
"" \
14201421
) do @echo.%~J>>rbincs.mk]

0 commit comments

Comments
 (0)