OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #11095 : brson/rust/issue-11094, r=alexcrichton

This commit is contained in:
bors 2013-12-21 19:46:35 -08:00
parent ba801d8116 675aac3001
commit 256f6976ad
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mk/tests.mk
View File

@ -908,6 +908,8 @@ define DEF_RMAKE_FOR_T_H
# $(2) target triple # $(2) target triple
# $(3) host triple # $(3) host triple
ifeq ($(2)$(3),$$(CFG_BUILD)$$(CFG_BUILD))
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec: \ check-stage$(1)-T-$(2)-H-$(3)-rmake-exec: \
$$(call TEST_OK_FILE,$(1),$(2),$(3),rmake) $$(call TEST_OK_FILE,$(1),$(2),$(3),rmake)
@ -927,6 +929,13 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
"$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \ "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
@touch $$@ @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 endef