summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-18 16:01:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-18 16:01:58 +0000
commit278648b599d2b067fed55b130f95effbd7515e60 (patch)
tree0476de2e5c90455dc859bb9307ef3406564116e1
parent7b6f2e2c90f589c2d45abbf1e63139c1e7b8dbd7 (diff)
CHDIR to follow symlink [ci skip]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--defs/gmake.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 72955c5ce1..d8a43802ef 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -144,11 +144,11 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS
@$(BASERUBY) -C "$(srcdir)" -I./tool -rvcs -e 'VCS.detect(".").commit'
+$(Q) \
{ \
- cd "$(srcdir)"; \
+ $(CHDIR) "$(srcdir)"; \
sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \
sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \
} | \
- $(MAKE) $(mflags) Q=$(Q) srcdir="$(srcdir)" srcs_vpath="$(srcdir)/" CHDIR="$(CHDIR)" \
+ $(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="$(srcdir)/" CHDIR="$(CHDIR)" \
BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \
VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
update-src srcs all-incs