diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-08-26 13:09:48 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-08-26 13:13:19 +0900 |
| commit | 1581249de369e4d3e4ac09856bd10fb98cd4addb (patch) | |
| tree | 916a81e812d75add44c4be323447421862e769fe | |
| parent | 5e86b005c0f2ef30df2f9906c7e2f3abefe286a2 (diff) | |
Added in-srcdir macro [ci skip]
| -rw-r--r-- | defs/gmake.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index c76c2549ca..403b476c2b 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -25,6 +25,8 @@ TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts) +in-srcdir := $(if $(filter-out .,$(srcdir)),$(CHDIR) $(srcdir) &&) + ifneq ($(filter -O0 -Od,$(optflags)),) override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS)) endif @@ -148,7 +150,7 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS @$(BASERUBY) -C "$(srcdir)" -I./tool/lib -rvcs -e 'VCS.detect(".").commit' +$(Q) \ { \ - $(CHDIR) "$(srcdir)"; \ + $(in-srcdir) \ exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk; \ } | \ $(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \ |