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

ruby-changes:54202

From: nobu <ko1@a...>
Date: Mon, 17 Dec 2018 10:36:39 +0900 (JST)
Subject: [ruby-changes:54202] nobu:r66423 (trunk): Workaround for OpenBSD make

nobu	2018-12-17 10:36:34 +0900 (Mon, 17 Dec 2018)

  New Revision: 66423

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

  Log:
    Workaround for OpenBSD make
    
    * common.mk: read from node.h in the source directly, without
      VPATH.  [ruby-core:89151] [Bug #15154]
    
    From: kernigh (George Koehler) <xkernigh@n...>

  Modified files:
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 66422)
+++ common.mk	(revision 66423)
@@ -1023,12 +1023,9 @@ id.c: $(srcdir)/tool/generic_erb.rb $(sr https://github.com/ruby/ruby/blob/trunk/common.mk#L1023
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
 		$(srcdir)/template/id.c.tmpl
 
-{$(VPATH)}node.h: $(srcdir)/tool/node_name.rb
-# This dependency is not really correct, but $? should not include
-# node_name.rb in the following recipe.
-node_name.inc: {$(VPATH)}node.h
+node_name.inc: $(srcdir)/tool/node_name.rb $(srcdir)/node.h
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@
+	$(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $(srcdir)/node.h > $@
 
 encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
 	$(ECHO) generating $@

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

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