Update rbinc files for snapshots

Author: nobu

common.mk

@@ -1323,14 +1323,15 @@ $(BUILTIN_BINARY:no=builtin)_binary.rbbin:
 
 $(BUILTIN_RB_INCS): $(tooldir)/mk_builtin_loader.rb $(DUMP_AST_TARGET)
 
-$(CROSS_COMPILING:no=)dump_ast$(BUILD_EXEEXT): $(tooldir)/dump_ast.c $(LIBPRISM_OBJS)
+dump_ast$(BUILD_EXEEXT): $(tooldir)/dump_ast.c $(LIBPRISM_OBJS)
 	$(ECHO) compiling $@
 	$(Q) $(CC) $(CFLAGS) $(OUTFLAG)$@ $(INCFLAGS) $(tooldir)/dump_ast.c $(LIBPRISM_OBJS)
 
 build-tool/Makefile: $(tooldir)/dump_ast.mkmf.rb prism-srcs prism-incs
-	+$(BASERUBY) -s $(tooldir)/dump_ast.mkmf.rb -make="$(MAKE)" build-tool $(tooldir)/dump_ast.c dump_ast.$(OBJEXT) $(LIBPRISM_OBJS)
-$(CROSS_COMPILING:yes=)dump_ast$(BUILD_EXEEXT): build-tool/Makefile
-	cd build-tool && $(MAKE)
+	+$(BASERUBY) -s $(tooldir)/dump_ast.mkmf.rb "-INCFLAGS=$(INCFLAGS)" "-make=$(MAKE)" build-tool $(tooldir)/dump_ast.c dump_ast.$(OBJEXT) $(LIBPRISM_OBJS)
+
+build-tool/dump_ast$(BUILD_EXEEXT): build-tool/Makefile
+	cd build-tool && MAKEFLAGS= MFLAGS= && unset MAKEFLAGS MFLAGS && $(MAKE)
 
 clean-local:: clean-build-tool
 clean-build-tool:

configure.ac

@@ -119,7 +119,12 @@ AC_SUBST(X_BUILD_EXEEXT)
 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_TARGET='$(empty)'],
-	[DUMP_AST='./dump_ast$(BUILD_EXEEXT)' DUMP_AST_TARGET='$(DUMP_AST)'])
+	[AS_IF([test "$cross_compiling" = yes], [
+	    DUMP_AST='build-tool/dump_ast$(BUILD_EXEEXT)'
+	], [
+	    DUMP_AST='./dump_ast$(BUILD_EXEEXT)'
+	])
+	DUMP_AST_TARGET='$(DUMP_AST)'])
 dnl Without baseruby, .rbinc files cannot be regenerated, so clear the
 dnl dependency on dump_ast to avoid rebuilding pre-generated .rbinc files.
 AS_IF([test "$HAVE_BASERUBY" = no], [DUMP_AST_TARGET='$(empty)'])

tool/dump_ast.mkmf.rb

@@ -1,3 +1,4 @@
+#!ruby -s
 require 'mkmf'
 require 'pathname'
 require 'fileutils'
@@ -6,7 +7,7 @@
 src = Pathname(src)
 tooldir = src.parent.relative_path_from(workdir)
 srcdir = tooldir.parent
-target = Pathname('.').relative_path_from(workdir) + src.basename.sub_ext('')
+target = src.basename.sub_ext('')
 dirs = objs.map {|obj| File.dirname(obj)}.uniq - %w[.]
 link = MakeMakefile::TRY_LINK.sub(MakeMakefile::CONFTEST+$EXEEXT, '$(@)')
 prismdir= "$(srcdir)/#{dirs.first}"
@@ -25,6 +26,7 @@
     $(target): $(objs)
     \t#{link} $(objs)
 
+    objs: $(objs)
     .c.#{$OBJEXT}:
     \t#{MakeMakefile::COMPILE_C}
 

tool/make-snapshot

@@ -467,6 +467,7 @@ def package(vcs, rev, destdir, tmp = nil)
         "VPATH"=>(ENV["VPATH"] || "include/ruby"),
         "PROGRAM"=>(ENV["PROGRAM"] || "ruby"),
         "BUILTIN_TRANSOBJS"=>(ENV["BUILTIN_TRANSOBJS"] || "newline.o"),
+        "DUMP_AST"=>"build-tool/dump_ast#{RbConfig::CONFIG['EXEEXT']} ",
       }
       status.scan(/^s([%,])@([A-Za-z_][A-Za-z_0-9]*)@\1(.*?)\1g$/) do
         vars[$2] ||= $3
@@ -540,6 +541,7 @@ touch-unicode-files:
       File.utime(modified, modified, *Dir.glob(["tool/config.{guess,sub}", "gems/*.gem", "tool"]))
       return unless make.run("prepare-package")
       return unless make.run("clean-cache")
+      return unless make.run("clean")
       if modified
         new_time = modified + 2
         touch_all(new_time, "**/*", File::FNM_DOTMATCH) do |name, stat|