diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-19 09:00:33 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-19 09:00:33 +0000 |
| commit | 926b9e05f1b5c0863f52f6a0e7557fbb5503be4b (patch) | |
| tree | fecb3714793b571b2fa8ca70c5d9b07bb61db634 | |
| parent | a494ed4113c3f4fc93078e9b1ecba56e7f7f9006 (diff) | |
* common.mk (ext/ripper/ripper.c): pass build directory as VPATH.
* ext/ripper/depend (.y.c): use VPATH for y.tab.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | common.mk | 5 | ||||
| -rw-r--r-- | ext/ripper/depend | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Nov 19 17:59:25 2014 NARUSE, Yui <naruse@ruby-lang.org> + + * common.mk (ext/ripper/ripper.c): pass build directory as VPATH. + + * ext/ripper/depend (.y.c): use VPATH for y.tab.c. + Wed Nov 19 10:07:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * template/prelude.c.tmpl (Prelude#translate): strip VPATH prefix @@ -807,8 +807,9 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastr $(srcdir)/ext/ripper/ripper.c: parse.y id.h $(ECHO) generating $@ - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \ - Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" + $(Q) vpath=`pwd` && $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \ + Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=$(vpath) \ + RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(ECHO) generating $@ diff --git a/ext/ripper/depend b/ext/ripper/depend index 2764389b5b..0e0c757233 100644 --- a/ext/ripper/depend +++ b/ext/ripper/depend @@ -12,7 +12,7 @@ ripper.o: ripper.c .y.c: $(ECHO) compiling compiler $< $(Q) $(BISON) -t -v -oy.tab.c $< - $(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@ + $(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" $(VPATH)/y.tab.c > $@ @$(RM) y.tab.c all: check |