Skip to content

Commit 10c46eb

Browse files
committed
Disable rustdoc exec tests when running atop a stage1 rustc.
The hopefully final baby step towards a working `make check-stage1`.
1 parent ab9dc62 commit 10c46eb

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

mk/tests.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,23 @@ check-stage$(1)-T-$(2)-H-$(3)-crates-exec: \
312312

313313
endif
314314

315+
# Issue #13983: rustdoc wants rpath for host and target at same time.
316+
# This is not generally compatible with stage1, so skip it.
317+
ifeq ($(1),1)
318+
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec:
319+
echo skipping $@ when running in stage$(1)
320+
321+
check-stage$(1)-T-$(2)-H-$(3)-doc-exec:
322+
echo skipping $@ when running in stage$(1)
323+
else
315324
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec: \
316325
$$(foreach crate,$$(TEST_DOC_CRATES), \
317326
check-stage$(1)-T-$(2)-H-$(3)-doc-crate-$$(crate)-exec)
318327

319328
check-stage$(1)-T-$(2)-H-$(3)-doc-exec: \
320329
$$(foreach docname,$$(DOCS), \
321330
check-stage$(1)-T-$(2)-H-$(3)-doc-$$(docname)-exec)
331+
endif
322332

323333
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \
324334
check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-exec \

0 commit comments

Comments
 (0)