summaryrefslogtreecommitdiff
path: root/defs
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-23 04:10:41 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-23 04:10:41 (GMT)
commit532bbd4ebf7a90c101a4cb42a680bbb0e29e64d8 (patch)
treebc77fa7365e6d39eff40ab72ee96d73ef75062c4 /defs
parentc9447082ecbcab5dab9dcbcaa93686648008d8f8 (diff)
fix circular dependencies
* defs/gmake.mk (TEST_DEPENDS): remove targets expanded as TEST_TARGETS, to get rid of circular dependencies. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defs')
-rw-r--r--defs/gmake.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index f79db53..8094891 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -8,13 +8,13 @@ CHECK_TARGETS := exam love check%
TEST_TARGETS := $(filter exam check test check% test% btest%,$(MAKECMDGOALS))
TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(MAKECMDGOALS))
TEST_TARGETS := $(patsubst exam,check test-rubyspec,$(TEST_TARGETS))
-TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_DEPENDS := $(filter-out exam $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS))
-TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_DEPENDS := $(filter-out love $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_TARGETS := $(patsubst check,test test-testframework test-almost,$(patsubst check-%,test test-%,$(TEST_TARGETS)))
-TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_DEPENDS := $(filter-out check $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_TARGETS := $(patsubst test,btest-ruby test-knownbug test-basic,$(TEST_TARGETS))
-TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_DEPENDS += $(if $(filter-out btest%,$(TEST_TARGETS)),all exts)
ifneq ($(filter -O0 -Od,$(optflags)),)