nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #29195 - alexcrichton:fix-windows-dist, r=brson

Browse Source 
These were accidentally placed into the wrong package (std) when they should
have been in the main package (rustc)

Closes #29195
This commit is contained in:
bors 2015-10-22 10:22:43 +00:00
commit e85b3d84a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/dist.mk
View File

@ -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 \