nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-22 11:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Anderson 2013-07-29 11:20:48 -07:00
parent fddb35e988
commit 8ae900f51d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mk/tests.mk
View File

@ -312,28 +312,26 @@ define TEST_RUNNER
# If NO_REBUILD is set then break the dependencies on extra so we can # If NO_REBUILD is set then break the dependencies on extra so we can
# test crates without rebuilding std and extra first # test crates without rebuilding std and extra first
ifeq ($(NO_REBUILD),) 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 else
STDTESTDEP_$(1)_$(2)_$(3) = STDTESTDEP_$(1)_$(2)_$(3) =
endif endif
$(3)/stage$(1)/test/stdtest-$(2)$$(X_$(2)): \ $(3)/stage$(1)/test/stdtest-$(2)$$(X_$(2)): \
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \ $$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
$$(SREQ$(1)_T_$(2)_H_$(3)) \
$$(STDTESTDEP_$(1)_$(2)_$(3)) $$(STDTESTDEP_$(1)_$(2)_$(3))
@$$(call E, compile_and_link: $$@) @$$(call E, compile_and_link: $$@)
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
$(3)/stage$(1)/test/extratest-$(2)$$(X_$(2)): \ $(3)/stage$(1)/test/extratest-$(2)$$(X_$(2)): \
$$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \ $$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \
$$(SREQ$(1)_T_$(2)_H_$(3)) \
$$(STDTESTDEP_$(1)_$(2)_$(3)) $$(STDTESTDEP_$(1)_$(2)_$(3))
@$$(call E, compile_and_link: $$@) @$$(call E, compile_and_link: $$@)
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
$(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \ $(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \ $$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
$$(SREQ$(1)_T_$(2)_H_$(3)) \
$$(STDTESTDEP_$(1)_$(2)_$(3)) $$(STDTESTDEP_$(1)_$(2)_$(3))
@$$(call E, compile_and_link: $$@) @$$(call E, compile_and_link: $$@)
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test