From 675aac3001f4d6b31555e5afa0eed200bdd1d709 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 20 Dec 2013 18:06:12 -0800 Subject: [PATCH] mk: Work around problem with run-make tests on multiple targets. #11094 --- mk/tests.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mk/tests.mk b/mk/tests.mk index b026055ab25..b5b8a5cf25e 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -911,6 +911,8 @@ define DEF_RMAKE_FOR_T_H # $(2) target triple # $(3) host triple + +ifeq ($(2)$(3),$$(CFG_BUILD)$$(CFG_BUILD)) check-stage$(1)-T-$(2)-H-$(3)-rmake-exec: \ $$(call TEST_OK_FILE,$(1),$(2),$(3),rmake) @@ -930,6 +932,13 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \ "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \ $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) @touch $$@ +else +# FIXME #11094 - The above rule doesn't work right for multiple targets +check-stage$(1)-T-$(2)-H-$(3)-rmake-exec: + @true + +endif + endef