summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-13 06:16:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-13 06:16:56 +0000
commitc878cf50305cd1e00242932d55b2141a3b023526 (patch)
tree1748351c6cc8ee5b5dc7cbec8135a6b5fa4d2a06
parent5f376ce0a757496129fd3ec4ff282df8d02d7dfe (diff)
Moved REVISION_FORCE before uncommon.mk
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--defs/gmake.mk4
-rw-r--r--template/GNUmakefile.in5
2 files changed, 5 insertions, 4 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index ed6cbf2..eb8b560 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 f603210..d0444d3 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