Skip to content

Commit 675aac3

Browse files
committed
mk: Work around problem with run-make tests on multiple targets. #11094
1 parent b6933f8 commit 675aac3

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
@@ -911,6 +911,8 @@ define DEF_RMAKE_FOR_T_H
911911
# $(2) target triple
912912
# $(3) host triple
913913

914+
915+
ifeq ($(2)$(3),$$(CFG_BUILD)$$(CFG_BUILD))
914916
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec: \
915917
$$(call TEST_OK_FILE,$(1),$(2),$(3),rmake)
916918

@@ -930,6 +932,13 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
930932
"$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
931933
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
932934
@touch $$@
935+
else
936+
# FIXME #11094 - The above rule doesn't work right for multiple targets
937+
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec:
938+
@true
939+
940+
endif
941+
933942

934943
endef
935944

0 commit comments

Comments
 (0)