diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-29 02:06:38 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-29 02:06:38 +0000 |
| commit | 53e301a2d804919341b7012d58686edab5386116 (patch) | |
| tree | 521812287802bc04a38f1cd16d73f028e0840b12 /common.mk | |
| parent | c02ffd9a8ff79324ae178adf41f5d18f3b4ca634 (diff) | |
common.mk: fix conflict of version.i
* common.mk ($(arch)-fake.rb): read from STDIN instead of creating
version.i, to get rid of conflict with tool/update-deps.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -549,14 +549,13 @@ fake: $(CROSS_COMPILING)-fake yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY no-fake -fake: PHONY -$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(srcdir)/tool/generic_erb.rb version.i - $(ECHO) generating $@ - $(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -c -o $@ "$(srcdir)/template/fake.rb.in" \ - i=version.i srcdir="$(srcdir)" BASERUBY="$(BASERUBY)" - -# .i really doesn't depend on .o, just ensure newer than headers which +# really doesn't depend on .o, just ensure newer than headers which # version.o depends on. -version.i: version.$(OBJEXT) +$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(srcdir)/tool/generic_erb.rb version.$(OBJEXT) + $(ECHO) generating $@ + $(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \ + $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \ + i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)" btest: $(TEST_RUNNABLE)-btest no-btest: PHONY |