Do not update the dump_ast specified in the configure options

Author: nobu

common.mk

@@ -1295,7 +1295,7 @@ preludes: {$(VPATH)}miniprelude.c
 
 {$(srcdir)}.rb.rbinc:
 	$(ECHO) making $@
-	-$(Q) $(MAKE) $(DUMP_AST)
+	-$(Q) $(MAKE) $(DUMP_AST_TARGET)
 	$(Q) $(BASERUBY) $(tooldir)/mk_builtin_loader.rb $(DUMP_AST) $(SRC_FILE)
 
 $(BUILTIN_BINARY:yes=built)in_binary.rbbin: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary.rbbin.tmpl

configure.ac

@@ -113,9 +113,10 @@ AC_SUBST(HAVE_BASERUBY)
 
 AC_ARG_WITH(dump-ast,
 	AS_HELP_STRING([--with-dump-ast=DUMP_AST], [use DUMP_AST as dump_ast; for cross-compiling with a host-built dump_ast]),
-	[DUMP_AST=$withval],
-	[DUMP_AST='./dump_ast$(EXEEXT)'])
-AC_SUBST(DUMP_AST)
+	[DUMP_AST=$withval DUMP_AST_TARGET=no],
+	[DUMP_AST='./dump_ast$(EXEEXT)' DUMP_AST_TARGET='$(DUMP_AST)'])
+AC_SUBST(X_DUMP_AST, "${DUMP_AST}")
+AC_SUBST(X_DUMP_AST_TARGET, "${DUMP_AST_TARGET}")
 
 : ${GIT=git}
 HAVE_GIT=yes

template/Makefile.in

@@ -37,7 +37,8 @@ CONFIGURE = @CONFIGURE@
 MKFILES = @MAKEFILES@
 BASERUBY = @BASERUBY@
 HAVE_BASERUBY = @HAVE_BASERUBY@
-DUMP_AST = @DUMP_AST@
+DUMP_AST = @X_DUMP_AST@
+DUMP_AST_TARGET = @X_DUMP_AST_TARGET@
 TEST_RUNNABLE = @TEST_RUNNABLE@
 CROSS_COMPILING = @CROSS_COMPILING@
 DOXYGEN = @DOXYGEN@