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

ruby-changes:36418

From: nobu <ko1@a...>
Date: Thu, 20 Nov 2014 00:19:48 +0900 (JST)
Subject: [ruby-changes:36418] nobu:r48499 (trunk): common.mk: fix build error

nobu	2014-11-20 00:19:33 +0900 (Thu, 20 Nov 2014)

  New Revision: 48499

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

  Log:
    common.mk: fix build error
    
    * common.mk (ext/ripper/ripper.c): VPATH is always ../.. from
      ext/ripper.
    
    * ext/ripper/depend (.y.c): VPATH is not needed for an
      intermediate file.

  Modified files:
    trunk/common.mk
    trunk/ext/ripper/depend
Index: common.mk
===================================================================
--- common.mk	(revision 48498)
+++ common.mk	(revision 48499)
@@ -808,7 +808,7 @@ $(REVISION_H): $(srcdir)/version.h $(src https://github.com/ruby/ruby/blob/trunk/common.mk#L808
 $(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=$(PWD) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. \
 		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
 $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
Index: ext/ripper/depend
===================================================================
--- ext/ripper/depend	(revision 48498)
+++ ext/ripper/depend	(revision 48499)
@@ -12,7 +12,7 @@ ripper.o: ripper.c https://github.com/ruby/ruby/blob/trunk/ext/ripper/depend#L12
 .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!$@!" $(VPATH)/y.tab.c > $@
+	$(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
 	@$(RM) y.tab.c
 
 all: check

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

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