Cleanup the library path now that we copy from stageN/lib to stageN+1/
This commit is contained in:
parent
d79afd7916
commit
ea371a3d37
|
@ -183,7 +183,7 @@ SREQ$(1) = stage$(1)/rustc$(X) \
|
|||
$$(MKFILES)
|
||||
endif
|
||||
|
||||
STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1),stage$(1), \
|
||||
STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \
|
||||
$$(CFG_VALGRIND_COMPILE) stage$(1)/rustc$$(X) \
|
||||
$$(CFG_RUSTC_FLAGS))
|
||||
endef
|
||||
|
|
|
@ -77,7 +77,7 @@ ifdef CFG_UNIXY
|
|||
|
||||
CFG_PATH_MUNGE := true
|
||||
CFG_EXE_SUFFIX :=
|
||||
CFG_RUN_TARG=$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1) $(3)
|
||||
CFG_RUN_TARG=$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1) $(2)
|
||||
CFG_RUN_TEST=\
|
||||
$(CFG_LDENV)=$(call CFG_TESTLIB,$(1)) \
|
||||
$(CFG_VALGRIND) $(1)
|
||||
|
@ -118,7 +118,7 @@ ifdef CFG_WINDOWSY
|
|||
CFG_LDPATH :=$(CFG_LLVM_BINDIR)
|
||||
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
|
||||
CFG_RUN_TEST=PATH="$(CFG_LDPATH):$(call CFG_TESTLIB,$(1))" $(1)
|
||||
CFG_RUN_TARG=PATH="$(CFG_BUILD_DIR)/$(2)/lib:$(CFG_LDPATH)" $(3)
|
||||
CFG_RUN_TARG=PATH="$(CFG_LDPATH)" $(2)
|
||||
|
||||
ifndef CFG_ENABLE_MINGW_CROSS
|
||||
CFG_PATH_MUNGE := $(strip perl -i.bak -p \
|
||||
|
|
2
mk/pp.mk
2
mk/pp.mk
|
@ -9,7 +9,7 @@ PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L no-reformat)
|
|||
reformat: $(SREQ1)
|
||||
@$(call E, reformat [stage1]: $@)
|
||||
for i in $(PP_INPUTS_FILTERED); \
|
||||
do $(call CFG_RUN_TARG,stage0,stage0,stage1/rustc$(X)) \
|
||||
do $(call CFG_RUN_TARG,stage0,stage1/rustc$(X)) \
|
||||
--pretty normal $$i >$$i.tmp; \
|
||||
if cmp --silent $$i.tmp $$i; \
|
||||
then echo no changes to $$i; rm $$i.tmp; \
|
||||
|
|
|
@ -13,7 +13,7 @@ define STAGEN
|
|||
# for different directories, to handle cases where (say) a test relies on a
|
||||
# compiler that relies on a .o file.
|
||||
|
||||
STAGE$(2) := $$(Q)$$(call CFG_RUN_TARG,stage$(2),stage$(1), \
|
||||
STAGE$(2) := $$(Q)$$(call CFG_RUN_TARG,stage$(2), \
|
||||
$$(CFG_VALGRIND_COMPILE) stage$(2)/rustc$$(X) \
|
||||
$$(CFG_RUSTC_FLAGS))
|
||||
|
||||
|
|
12
mk/tests.mk
12
mk/tests.mk
|
@ -351,15 +351,15 @@ test/stdtest.stage3$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ3)
|
|||
|
||||
check-stage1-std:test/stdtest.stage1$(X)
|
||||
@$(call E, run: $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage1,stage1, $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage1, $<)
|
||||
|
||||
check-stage2-std:test/stdtest.stage2$(X)
|
||||
@$(call E, run: $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage2,stage2, $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage2, $<)
|
||||
|
||||
check-stage3-std:test/stdtest.stage3$(X)
|
||||
@$(call E, run: $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage3,stage3, $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage3, $<)
|
||||
|
||||
# Testing the rustctest crate
|
||||
|
||||
|
@ -380,12 +380,12 @@ test/rustctest.stage3$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2) \
|
|||
|
||||
check-stage1-rustc: test/rustctest.stage1$(X)
|
||||
@$(call E, run: $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage1,stage0, $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage1, $<)
|
||||
|
||||
check-stage2-rustc: test/rustctest.stage2$(X)
|
||||
@$(call E, run: $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage2,stage1, $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage2, $<)
|
||||
|
||||
check-stage3-rustc: test/rustctest.stage3$(X)
|
||||
@$(call E, run: $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage2,stage1, $<)
|
||||
$(Q)$(call CFG_RUN_TARG,stage2, $<)
|
||||
|
|
Loading…
Reference in New Issue