mk: Fix NO_REBUILD so stdtest can be tested without re-bootstrapping. Closes #8101

diff --git a/mk/tests.mk b/mk/tests.mk
index 9e0ccb5dbeed6c00e9c51c60851596fc862b3236..4fab9f69c863a433458b807405461d1748bc3d7c 100644 (file)
--- 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