nobu	2018-11-13 12:24:18 +0900 (Tue, 13 Nov 2018)

  New Revision: 65695

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65695

  Log:
    gmake.mk: force updating revision.h
    
    Since `.revision.time` recipe needs `$(BASERUBY)`, it should not
    try to get updated unconditionally, or tarballs fail to build on
    environments where BASERUBY is not available.
    
    All developers who build frequently use GNU make anyway, don't
    you?

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
    trunk/win32/Makefile.sub
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 65694)
+++ defs/gmake.mk	(revision 65695)
@@ -4,6 +4,10 @@ override gnumake_recursive := $(if $(fin https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L4
 override mflags := $(filter-out -j%,$(MFLAGS))
 MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
 
+ifeq ($(HAVE_BASERUBY),yes)
+override REVISION_FORCE := PHONY
+endif
+
 CHECK_TARGETS := great exam love check test check% test% btest%
 # expand test targets, and those dependents
 TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS))
@@ -150,7 +154,7 @@ commit: $(if $(filter commit,$(MAKECMDGO https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L154
 	} | \
 	$(MAKE) $(mflags) Q=$(Q) srcdir="$(srcdir)" srcs_vpath="$(srcdir)/" CHDIR="$(CHDIR)" \
 		BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \
-		VCSUP="" ENC_MK=.top-enc.mk CONFIGURE="$(CONFIGURE)" -f - \
+		VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
 		update-src srcs all-incs
 
 ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
Index: common.mk
===================================================================
--- common.mk	(revision 65694)
+++ common.mk	(revision 65695)
@@ -1052,7 +1052,7 @@ preludes: {$(srcdir)}golf_prelude.c https://github.com/ruby/ruby/blob/trunk/common.mk#L1052
 $(srcdir)/revision.h:
 	@exit > $@
 
-$(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb PHONY
+$(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
 	-$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h "$(srcdir)" > revision.tmp
 	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
 
@@ -1168,7 +1168,7 @@ dist: https://github.com/ruby/ruby/blob/trunk/common.mk#L1168
 up:: update-remote
 
 up::
-	-$(Q)$(MAKE) $(mflags) Q=$(Q) "$(REVISION_H)"
+	-$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
 
 up::
 	-$(Q)$(MAKE) $(mflags) Q=$(Q) after-update
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 65694)
+++ win32/Makefile.sub	(revision 65695)
@@ -14,6 +14,12 @@ PWD = $(MAKEDIR) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L14
 MFLAGS=-l
 !endif
 
+!ifndef REVISION_FORCE
+!if "$(HAVE_BASERUBY)" == "yes"
+REVISION_FORCE = PHONY
+!endif
+!endif
+
 !ifndef CROSS_COMPILING
 CROSS_COMPILING = no
 !endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/