aboutsummaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-27 12:30:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-27 12:30:55 +0000
commit30bbc91f1e3af3f1f873267912878d09dfeda4d4 (patch)
tree525c4eac6dd81cf902bbfbd7acfec3dd148ae890 /common.mk
parentee3ea93fbaa1e7a1ef09b4b4cc45c67d89c0f738 (diff)
downloadruby-30bbc91f1e3af3f1f873267912878d09dfeda4d4.tar.gz
fix ripper prereq
* common.mk (ext/ripper/ripper.c): fix VPATH when out-of-place build, and id.h was created in the build directory too. it has to include the build directory, i.e., the current directory before `cd`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 873b6fb851..af3145c8c7 100644
--- a/common.mk
+++ b/common.mk
@@ -961,10 +961,10 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FOR
$(srcdir)/ext/ripper/ripper.c: $(srcdir)/parse.y id.h
$(ECHO) generating $@
- $(Q) $(CHDIR) $(@D) && \
+ $(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \
sed /AUTOGENERATED/q depend | \
$(exec) $(MAKE) -f - $(mflags) \
- Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \
+ Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl