diff --git a/Makefile.in b/Makefile.in
index cae6155933c..4192d15d1f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,7 +109,7 @@ VPATH := $(S)doc $(S)src
 
 # Compilers we build, we now know how to run.
 STAGE0 := $(Q)$(call CFG_RUN_TARG,stage0,\
-                stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0)
+                stage0/rustc$(X) $(CFG_RUSTC_FLAGS))
 STAGE1 := $(Q)$(call CFG_RUN_TARG,stage0, \
                 $(CFG_VALGRIND_COMPILE) stage1/rustc$(X) \
                 $(CFG_RUSTC_FLAGS))
diff --git a/mk/platform.mk b/mk/platform.mk
index 8c9535e1ec0..ee785dd7263 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -67,7 +67,7 @@ CFG_LDPATH :=$(CFG_BUILD_DIR)/rt
 CFG_LDPATH :=$(CFG_LDPATH):$(CFG_BUILD_DIR)/rustllvm
 CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip     \
  $(if $(findstring stage0,$(1)),         \
-       stage0,                           \
+       stage0/lib,                           \
       $(if $(findstring stage1,$(1)),    \
            stage1/lib,                       \
           $(if $(findstring stage2,$(1)),\
@@ -82,7 +82,7 @@ ifdef CFG_WINDOWSY
   CFG_LDPATH :=$(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)/$(1):$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH)" $(2)
+  CFG_RUN_TARG=PATH="$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH)" $(2)
 
   CFG_PATH_MUNGE := $(strip perl -i.bak -p             \
                            -e 's@\\(\S)@/\1@go;'       \
@@ -98,7 +98,7 @@ ifdef CFG_UNIXY
   CFG_PATH_MUNGE := true
   CFG_EXE_SUFFIX :=
   CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_LIBDIR)
-  CFG_RUN_TARG=$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1):$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
+  CFG_RUN_TARG=$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
   CFG_RUN_TEST=\
       $(CFG_LDENV)=$(call CFG_TESTLIB,$(1)):$(CFG_LDPATH) \
       $(CFG_VALGRIND) $(1)
@@ -108,7 +108,7 @@ ifdef CFG_UNIXY
     CFG_LIB_NAME=$(1).dll
     CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR)
     CFG_LDPATH :=$(CFG_LDPATH):$$PATH
-    CFG_RUN_TARG=PATH=$(CFG_BUILD_DIR)/$(1):$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
+    CFG_RUN_TARG=PATH=$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
     CFG_RUN_TEST=PATH=$(CFG_LDPATH):$(call CFG_TESTLIB,$(1)) $(1)
 
     CFG_INFO := $(info cfg: mingw-cross)