diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-05 03:57:05 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-05 09:26:57 +0900 |
commit | 21d0b40de2897ac2e98104cb3d33cd374a4402ee (patch) | |
tree | 66172b7fc8c7fa391cc2bba8ab77fb9e69256577 /defs | |
parent | 5e2463b242d1c7fc9f0bad11daa2a8a288dc28e3 (diff) |
Added tooldir variable
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3003
Diffstat (limited to 'defs')
-rw-r--r-- | defs/gmake.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index c28d49c20d..67898cef3d 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -356,7 +356,7 @@ clean-srcs-extra:: ifneq ($(filter $(VCS),git),) update-src:: - @$(BASERUBY) $(srcdir)/tool/lib/colorize.rb pass "Latest commit hash = $(shell $(filter-out svn,$(VCS)) -C $(srcdir) rev-parse --short=10 HEAD)" + @$(BASERUBY) $(tooldir)/lib/colorize.rb pass "Latest commit hash = $(shell $(filter-out svn,$(VCS)) -C $(srcdir) rev-parse --short=10 HEAD)" endif # Update dependencies and commit the updates to the current branch. @@ -365,7 +365,7 @@ update-deps: $(eval deps_dir := $(shell mktemp -d)/$(update_deps)) $(eval GIT_DIR := $(shell git -C $(srcdir) rev-parse --absolute-git-dir)) git --git-dir=$(GIT_DIR) worktree add $(deps_dir) - cp $(srcdir)/tool/config.guess $(srcdir)/tool/config.sub $(deps_dir)/tool + cp $(tooldir)/config.guess $(tooldir)/config.sub $(deps_dir)/tool [ -f config.status ] && cp config.status $(deps_dir) cd $(deps_dir) && autoconf && \ exec ./configure -q -C --enable-load-relative --disable-install-doc --disable-rubygems 'optflags=-O0' 'debugflags=-save-temps=obj -g' |