---

yaml
---
r: 5695
b: refs/heads/master
c: e963cfd
h: refs/heads/master
i:
  5693: 32ae3e3
  5691: 2f4fafd
  5687: be5a57e
  5679: 4e1a95a
  5663: 48deb49
  5631: d667f7e
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edf2622e218b3492d3379c4fdd1f3a211883f92a
+refs/heads/master: e963cfd41a4c8acbd42e88511fb0ab27ea11f5b3

trunk/mk/platform.mk

@@ -89,7 +89,7 @@ CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip \
                stage2/lib, \
                $(if $(findstring stage3,$(1)), \
                     stage3/lib, \
-               )))))
+               )))))/rustc/$(CFG_HOST_TRIPLE)/lib
 
 ifdef CFG_UNIXY
   CFG_INFO := $(info cfg: unix-y environment)

trunk/mk/tests.mk

@@ -160,7 +160,7 @@ test/rustctest.stage$(1)$$(X): \
 
 check-stage$(1)-rustc-dummy: test/rustctest.stage$(1)$$(X)
 	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN,$$(HOST_LIB$(1)),$$(CFG_VALGRIND) $$<) \
+	$$(Q)$$(call CFG_RUN_TEST,$$<) \
 	  $$(TESTARGS)
 
 
@@ -286,11 +286,12 @@ test/$(FT).rc test/$(FT_DRIVER).rs: $(TEST_RPASS_SOURCES_STAGE2) \
 	@$(call E, check: building combined stage2 test runner)
 	$(Q)$(S)src/etc/combine-tests.py
 
-stage2/lib/$(FT_LIB): test/$(FT).rc $(SREQ2$(CFG_HOST_TRIPLE))
+$(TARGET_HOST_LIB2)/$(FT_LIB): test/$(FT).rc $(SREQ2$(CFG_HOST_TRIPLE))
 	@$(call E, compile_and_link: $@)
 	$(STAGE2) --lib -o $@ $<
 
-test/$(FT_DRIVER)$(X): test/$(FT_DRIVER).rs $(HOST_LIB2)/$(FT_LIB) $(SREQ2$(CFG_HOST_TRIPLE))
+test/$(FT_DRIVER)$(X): test/$(FT_DRIVER).rs $(TARGET_HOST_LIB2)/$(FT_LIB) \
+	$(SREQ2$(CFG_HOST_TRIPLE))
 	@$(call E, compile_and_link: $@)
 	$(STAGE2) -L $(HOST_LIB2) -o $@ $<