summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-24 15:08:25 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-24 15:08:25 +0000
commit9bf0f4b9109588aed8f5816914b0180c8489de33 (patch)
treed1aaa3ac634c390cff63c7940b90a2a2177960d6 /common.mk
parent60926acd9b8623a4acd668fb966c892a719e02dc (diff)
Revert "common.mk: timestamp file for verconf.h"
This reverts commit r54748. It breaks build. http://www.rubyist.net/~akr/chkbuild/debian/ruby-trunk/log/20160424T120700Z.log.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/common.mk b/common.mk
index 910acae9fd..641cb566cb 100644
--- a/common.mk
+++ b/common.mk
@@ -623,7 +623,7 @@ extconf: $(PREP)
$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
-$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
+$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
-cross_compiling=$(CROSS_COMPILING) \
-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
@@ -748,11 +748,9 @@ $(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.
$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
enc/trans/newline.$(OBJEXT): $(NEWLINE_C)
-VERCONF_H = ./.time.verconf.h
-
-$(VERCONF_H): $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(PREP)
+verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
$(ECHO) creating $@
- $(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -c -t -o verconf.h $(srcdir)/template/verconf.h.tmpl
+ $(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
ruby-glommed.$(OBJEXT): $(OBJS)