From 8ae900f51d25512a3d95794b1f961ecc31f134f9 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 29 Jul 2013 11:20:48 -0700 Subject: [PATCH] mk: Fix NO_REBUILD so stdtest can be tested without re-bootstrapping. Closes #8101 --- mk/tests.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mk/tests.mk b/mk/tests.mk index 9e0ccb5dbee..4fab9f69c86 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -312,28 +312,26 @@ define TEST_RUNNER # If NO_REBUILD is set then break the dependencies on extra so we can # test crates without rebuilding std and extra first ifeq ($(NO_REBUILD),) -STDTESTDEP_$(1)_$(2)_$(3) = $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_EXTRALIB_$(2)) +STDTESTDEP_$(1)_$(2)_$(3) = $$(SREQ$(1)_T_$(2)_H_$(3)) \ + $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_EXTRALIB_$(2)) else STDTESTDEP_$(1)_$(2)_$(3) = endif $(3)/stage$(1)/test/stdtest-$(2)$$(X_$(2)): \ $$(STDLIB_CRATE) $$(STDLIB_INPUTS) \ - $$(SREQ$(1)_T_$(2)_H_$(3)) \ $$(STDTESTDEP_$(1)_$(2)_$(3)) @$$(call E, compile_and_link: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test $(3)/stage$(1)/test/extratest-$(2)$$(X_$(2)): \ $$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \ - $$(SREQ$(1)_T_$(2)_H_$(3)) \ $$(STDTESTDEP_$(1)_$(2)_$(3)) @$$(call E, compile_and_link: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test $(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \ $$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \ - $$(SREQ$(1)_T_$(2)_H_$(3)) \ $$(STDTESTDEP_$(1)_$(2)_$(3)) @$$(call E, compile_and_link: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test