From 510c3c088f937a5bd5612ba16c79f3eb095362fb Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 20 Oct 2015 20:58:03 -0700 Subject: [PATCH] mk: Fix win32 runtime DLL installation These were accidentally placed into the wrong package (std) when they should have been in the main package (rustc) --- mk/dist.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/dist.mk b/mk/dist.mk index eb94760e248..b4653924f3e 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -157,7 +157,7 @@ dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)-host prepare-overlay-$(1) ifeq ($(2),i686-pc-windows-gnu) $$(Q)rm -Rf tmp/dist/win-rust-gcc-$(2) $$(Q)$$(CFG_PYTHON) $$(S)src/etc/make-win-dist.py \ - tmp/dist/$$(STD_PKG_NAME)-$(2)-image \ + tmp/dist/$$(PKG_NAME)-$(2)-image \ tmp/dist/win-rust-gcc-$(2) $(2) endif # On 32-bit MinGW we're always including a DLL which needs some extra licenses @@ -168,7 +168,7 @@ endif ifdef CFG_WINDOWSY_$(2) ifeq ($$(findstring $(2),gnu),gnu) $$(Q)cp -r $$(S)src/etc/third-party \ - tmp/dist/$$(STD_PKG_NAME)-$(2)-image/share/doc/ + tmp/dist/$$(PKG_NAME)-$(2)-image/share/doc/ endif endif $$(Q)$$(S)src/rust-installer/gen-installer.sh \