From c878cf50305cd1e00242932d55b2141a3b023526 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 13 Nov 2018 06:16:56 +0000 Subject: Moved REVISION_FORCE before uncommon.mk git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- defs/gmake.mk | 4 ---- template/GNUmakefile.in | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/defs/gmake.mk b/defs/gmake.mk index ed6cbf230f..eb8b560bd8 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -4,10 +4,6 @@ override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+) override mflags := $(filter-out -j%,$(MFLAGS)) MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j) -ifeq ($(HAVE_BASERUBY),yes) -override REVISION_FORCE := PHONY -endif - CHECK_TARGETS := great exam love check test check% test% btest% # expand test targets, and those dependents TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in index f603210bc2..d0444d37e2 100644 --- a/template/GNUmakefile.in +++ b/template/GNUmakefile.in @@ -1,4 +1,9 @@ include Makefile + +ifeq ($(HAVE_BASERUBY),yes) +override REVISION_FORCE := PHONY +endif + include $(srcdir)/defs/universal.mk -include uncommon.mk include $(srcdir)/defs/gmake.mk -- cgit v1.2.3