diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-11-09 20:02:28 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-11-09 21:16:05 +0900 |
commit | fcf37ca2fef8248966dcd9143aaea569fc87953c (patch) | |
tree | fa57e11b4e6bc2397a754fca2d7c6531e4536fb2 | |
parent | 79f0e7aafd0532666a00a49ef8feb838b5e9e208 (diff) |
Fix builtin scirpt paths
Do not search builtin scripts by using VPATH, to get rid of weird
nmake VPATH.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2665
-rw-r--r-- | common.mk | 12 | ||||
-rw-r--r-- | win32/Makefile.sub | 3 |
2 files changed, 6 insertions, 9 deletions
@@ -985,11 +985,11 @@ $(srcs_vpath)mjit_compile.inc: $(srcdir)/tool/ruby_vm/views/mjit_compile.inc.erb $(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 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 a2d9d0db1c..a2521d4ed5 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1284,9 +1284,6 @@ $(ruby_pc): $(RBCONFIG) $(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$@ $(<:\=/) |