[前][次][番号順一覧][スレッド一覧]

ruby-changes:46380

From: nobu <ko1@a...>
Date: Thu, 27 Apr 2017 21:31:02 +0900 (JST)
Subject: [ruby-changes:46380] nobu:r58494 (trunk): fix ripper prereq

nobu	2017-04-27 21:30:55 +0900 (Thu, 27 Apr 2017)

  New Revision: 58494

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58494

  Log:
    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`.

  Modified files:
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 58493)
+++ common.mk	(revision 58494)
@@ -961,10 +961,10 @@ $(REVISION_H): $(srcdir)/version.h $(src https://github.com/ruby/ruby/blob/trunk/common.mk#L961
 
 $(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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]