summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2019-05-29 07:46:44 +0900
committerTakashi Kokubun <takashikkbn@gmail.com>2019-05-29 08:19:35 +0900
commite1f62d7f0e33de81a194f26a2c57e14e38d9de52 (patch)
tree3977b85937274d667640eb35b1cf5ee1dc6afc52 /common.mk
parentf0d1dc5cee87dfb023cb43a2db9bcdef5a8dee8f (diff)
Check the result of file2lastrev.rb if HAVE_BASERUBY
is yes. We ignored the failure status of file2lastrev.rb on 73da429c36c, but it was for an environment without BASERUBY. I think we should skip running file2lastrev.rb on HAVE_BASERUBY=no, and run it and check the status on HAVE_BASERUBY=yes. Otherwise we may have an ignored arbitrary error of file2lastrev.rb on HAVE_BASERUBY=yes environment.
Diffstat (limited to 'common.mk')
-rwxr-xr-xcommon.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 4f08bc2763..25050599f8 100755
--- a/common.mk
+++ b/common.mk
@@ -1091,8 +1091,11 @@ $(srcdir)/revision.h:
$(Q)$(gnumake:yes=#) $(RM) $(@F)
$(Q)$(gnumake:yes=#) exit > $@ || exit > $(@F)
-$(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
- -$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h "$(srcdir)" > revision.tmp
+revision.tmp: $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+revision$(HAVE_BASERUBY:yes=.tmp): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+ $(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h "$(srcdir)" > revision.tmp
+
+$(REVISION_H): revision.tmp
$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
$(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y id.h