summaryrefslogtreecommitdiff
path: root/win32/Makefile.sub
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-05 03:57:05 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-05 09:26:57 +0900
commit21d0b40de2897ac2e98104cb3d33cd374a4402ee (patch)
tree66172b7fc8c7fa391cc2bba8ab77fb9e69256577 /win32/Makefile.sub
parent5e2463b242d1c7fc9f0bad11daa2a8a288dc28e3 (diff)
Added tooldir variable
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3003
Diffstat (limited to 'win32/Makefile.sub')
-rw-r--r--win32/Makefile.sub9
1 files changed, 5 insertions, 4 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 6d91bbc..328f347 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -383,7 +383,7 @@ MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I.
RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I.
!endif
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
-RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS)
+RUNRUBY = $(RUNRUBY) "$(tooldir)/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS)
!if "$(CROSS_COMPILING)" == "yes"
XRUBY = $(MINIRUBY)
BOOTSTRAPRUBY = $(BASERUBY)
@@ -473,6 +473,7 @@ EXTOBJS = dmyext.$(OBJEXT)
arch_hdrdir = $(EXTOUT)/include/$(arch)
top_srcdir = $(srcdir)
hdrdir = $(srcdir)/include
+tooldir = $(srcdir)/tool
VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/missing;$(win_srcdir)
!ifndef GIT
@@ -1226,7 +1227,7 @@ update-benchmark-driver:
$(GIT) -C $(srcdir)/benchmark/benchmark-driver pull origin master
$(ruby_pc): $(RBCONFIG)
- @$(BOOTSTRAPRUBY) $(srcdir)/tool/expand-config.rb \
+ @$(BOOTSTRAPRUBY) $(tooldir)/expand-config.rb \
-output=$@ -mode=$(INSTALL_DATA_MODE) -config=rbconfig.rb \
$(srcdir)/template/ruby.pc.in
@@ -1360,9 +1361,9 @@ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
@for %J in (\
"%I: $$(srcdir)/insns.def {$$(VPATH)}vm_opts.h \" \
" $$(srcdir)/defs/opt_operand.def $$(srcdir)/defs/opt_insn_unif.def \" \
-" $$(srcdir)/tool/insns2vm.rb" \
+" $$(tooldir)/insns2vm.rb" \
" @$$(RM) $$(PROGRAM)" \
-" $$(Q) $$(BASERUBY) -Ku $$(srcdir)/tool/insns2vm.rb $$(INSNS2VMOPT) %I" \
+" $$(Q) $$(BASERUBY) -Ku $$(tooldir)/insns2vm.rb $$(INSNS2VMOPT) %I" \
"" \
) do @echo.%~J>>insns_rules.mk]
!else