diff --git a/Makefile.in b/Makefile.in
index 60967797eb8..7bd1c28e851 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,12 +53,6 @@ CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
 CFG_STDLIB :=$(call CFG_LIB_NAME,std)
 CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
 
-ifdef CFG_DISABLE_SHAREDSTD
-  CFG_STDLIB_DEFAULT = $(1)/lib/libstd.rlib
-else
-  CFG_STDLIB_DEFAULT = $(2)/lib/$(CFG_STDLIB)
-endif
-
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
 CFG_VERSION = prerelease
@@ -185,10 +179,16 @@ TARGET_HOST_ROOT$(1) = $$(TARGET_ROOT$(1)$$(CFG_HOST_TRIPLE))
 TARGET_HOST_BIN$(1) = $$(TARGET_BIN$(1)$$(CFG_HOST_TRIPLE))
 TARGET_HOST_LIB$(1) = $$(TARGET_LIB$(1)$$(CFG_HOST_TRIPLE))
 
+ifdef CFG_DISABLE_SHAREDSTD
+  HOST_STDLIB_DEFAULT$(1) = $$(HOST_LIB$(1))/libstd.rlib
+else
+  HOST_STDLIB_DEFAULT$(1) = $$(HOST_LIB$(1))/$(CFG_STDLIB)
+endif
+
 ifdef CFG_DISABLE_SHAREDSTD
 SREQ$(1)$(2) = $$(HOST_BIN$(1))/rustc$(X)          \
            $$(HOST_LIB$(1))/$$(CFG_RUNTIME)     \
-           $$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \
+           $$(HOST_STDLIB_DEFAULT$(1)) \
            $$(HOST_LIB$(1))/$$(CFG_RUSTLLVM)    \
            $$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME) \
            $$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB) \
@@ -198,7 +198,7 @@ SREQ$(1)$(2) = $$(HOST_BIN$(1))/rustc$(X)          \
 else
 SREQ$(1)$(2) = $$(HOST_BIN$(1))/rustc$(X)          \
            $$(HOST_LIB$(1))/$$(CFG_RUNTIME)     \
-           $$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(1)) \
+           $$(HOST_STDLIB_DEFAULT$(1)) \
            $$(HOST_LIB$(1))/$$(CFG_RUSTLLVM)    \
            $$(TARGET_LIB$(1)$(2))/$$(CFG_RUNTIME) \
            $$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB) \
diff --git a/mk/stageN.mk b/mk/stageN.mk
index 7e726bcae5e..f64c0088d29 100644
--- a/mk/stageN.mk
+++ b/mk/stageN.mk
@@ -29,7 +29,7 @@ $$(HOST_LIB$(2))/%.o: $$(HOST_LIB$(2))/%.s
 
 $$(HOST_BIN$(2))/rustc$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS)          \
                           $$(HOST_LIB$(2))/$$(CFG_RUNTIME)                       \
-                          $$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(2)) \
+                          $$(HOST_STDLIB_DEFAULT$(2)) \
                           $$(HOST_LIB$(2))/$$(CFG_RUSTLLVM)                      \
                           $$(SREQ$(1)$(3))
 	@$$(call E, compile_and_link: $$@)
@@ -49,6 +49,10 @@ $$(HOST_LIB$(2))/$$(CFG_STDLIB): $$(TARGET_HOST_LIB$(1))/$$(CFG_STDLIB)
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 
+$$(HOST_LIB$(2))/libstd.rlib: $$(TARGET_HOST_LIB$(1))/libstd.rlib
+	@$$(call E, cp: $$@)
+	$$(Q)cp $$< $$@
+
 $$(HOST_LIB$(2))/$$(CFG_RUSTLLVM): rustllvm/$$(CFG_RUSTLLVM)
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
diff --git a/mk/tests.mk b/mk/tests.mk
index 49534206df7..77ff20e5a01 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -147,7 +147,7 @@ check-stage$(2)-rustc: test/rustctest.stage$(2).out \
 
 test/rustctest.stage$(2)$$(X): $$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
                            $$(HOST_LIB$(2))/$$(CFG_RUNTIME) \
-                           $$(call CFG_STDLIB_DEFAULT,stage$(1),stage$(2)) \
+                           $$(HOST_STDLIB_DEFAULT$(2)) \
                            $$(HOST_LIB$(2))/$$(CFG_RUSTLLVM) \
                            $$(SREQ$(1)$$(CFG_HOST_TRIPLE))
 	@$$(call E, compile_and_link: $$@)