ruby-changes:58680
From: Nobuyoshi <ko1@a...>
Date: Sat, 9 Nov 2019 21:16:27 +0900 (JST)
Subject: [ruby-changes:58680] fcf37ca2fe (master): Fix builtin scirpt paths
https://git.ruby-lang.org/ruby.git/commit/?id=fcf37ca2fe From fcf37ca2fef8248966dcd9143aaea569fc87953c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 9 Nov 2019 20:02:28 +0900 Subject: Fix builtin scirpt paths Do not search builtin scripts by using VPATH, to get rid of weird nmake VPATH. diff --git a/common.mk b/common.mk index 5870b87..af90c53 100644 --- a/common.mk +++ b/common.mk @@ -985,11 +985,11 @@ $(srcs_vpath)mjit_compile.inc: $(srcdir)/tool/ruby_vm/views/mjit_compile.inc.erb https://github.com/ruby/ruby/blob/trunk/common.mk#L985 $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn_body.erb $(srcdir)/tool/ruby_vm/views/_mjit_compile_pc_and_sp.erb BUILTIN_RB_SRCS = \ - $(srcs_vpath)ast.rb \ - $(srcs_vpath)gc.rb \ - $(srcs_vpath)io.rb \ - $(srcs_vpath)pack.rb \ - $(srcs_vpath)trace_point.rb \ + $(srcdir)/ast.rb \ + $(srcdir)/gc.rb \ + $(srcdir)/io.rb \ + $(srcdir)/pack.rb \ + $(srcdir)/trace_point.rb \ $(empty) BUILTIN_RB_INCS = $(BUILTIN_RB_SRCS:.rb=.rbinc) @@ -1104,7 +1104,7 @@ preludes: {$(VPATH)}prelude.c https://github.com/ruby/ruby/blob/trunk/common.mk#L1104 preludes: {$(VPATH)}miniprelude.c preludes: {$(srcdir)}golf_prelude.c -.rb.rbinc: +{$(srcdir)}.rb.rbinc: $(ECHO) making $@ $(Q) $(BASERUBY) $(srcdir)/tool/mk_builtin_loader.rb $< diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a2d9d0d..a2521d4 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1284,9 +1284,6 @@ $(ruby_pc): $(RBCONFIG) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1284 $(ECHO) preprocessing $(<:\=/) $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P $(CSRCFLAG)$(<:\=/) -{$(srcdir)}.rb.rbinc: - $(Q) $(BASERUBY) $(srcdir)/tool/mk_builtin_loader.rb $< - .rc.res: $(ECHO) compiling $(<:\=/) $(Q) $(RC) $(RCFLAGS) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/) -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/