kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix builtin scirpt paths

Browse source 
Do not search builtin scripts by using VPATH, to get rid of weird
nmake VPATH.
This commit is contained in:
Nobuyoshi Nakada 2019-11-09 20:02:28 +09:00
parent 79f0e7aafd
commit fcf37ca2fe
Notes: git 2019-11-09 21:16:35 +09:00 
Merged: https://github.com/ruby/ruby/pull/2665
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common.mk
View file

@ -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 $<

3
win32/Makefile.sub
View file

@ -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$@ $(<:\=/)