Skip to content

Commit 256f697

Browse files
committed
auto merge of #11095 : brson/rust/issue-11094, r=alexcrichton
2 parents ba801d8 + 675aac3 commit 256f697

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

mk/tests.mk

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,8 @@ define DEF_RMAKE_FOR_T_H
908908
# $(2) target triple
909909
# $(3) host triple
910910

911+
912+
ifeq ($(2)$(3),$$(CFG_BUILD)$$(CFG_BUILD))
911913
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec: \
912914
$$(call TEST_OK_FILE,$(1),$(2),$(3),rmake)
913915

@@ -927,6 +929,13 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
927929
"$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
928930
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
929931
@touch $$@
932+
else
933+
# FIXME #11094 - The above rule doesn't work right for multiple targets
934+
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec:
935+
@true
936+
937+
endif
938+
930939

931940
endef
932941

0 commit comments

Comments
 (0)