about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-06-27 18:57:38 -0700
committerBrian Anderson <banderson@mozilla.com>2013-06-27 19:00:12 -0700
commit6511fe45e2df0328a5267dae9b1dda160edd1861 (patch)
tree8dffaf9959f39fe3cc2b7983a1e01a37dd85c7cb
parent59905d1f27192797bd5fd81c8ace934955be8a81 (diff)
downloadrust-6511fe45e2df0328a5267dae9b1dda160edd1861.tar.gz
rust-6511fe45e2df0328a5267dae9b1dda160edd1861.zip
mk: Include all bins in the windows install
-rw-r--r--mk/dist.mk2
-rw-r--r--mk/tools.mk3
2 files changed, 3 insertions, 2 deletions
diff --git a/mk/dist.mk b/mk/dist.mk
index 912b692a247..cb5b3607fca 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -57,7 +57,7 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
 	cp $< $@
 
 $(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
-            $(PKG_FILES) all rustc-stage3
+            $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
 	@$(call E, ISCC: $@)
 	$(Q)"$(CFG_ISCC)" $<
 endif
diff --git a/mk/tools.mk b/mk/tools.mk
index 7b50441b3c7..0a901358ac1 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -191,7 +191,8 @@ $(foreach host,$(CFG_HOST_TRIPLES),				\
 $(foreach target,$(CFG_TARGET_TRIPLES),				\
  $(eval $(call TOOLS_STAGE_N_TARGET,0,1,$(host),$(target)))	\
  $(eval $(call TOOLS_STAGE_N_TARGET,1,2,$(host),$(target)))	\
- $(eval $(call TOOLS_STAGE_N_TARGET,2,3,$(host),$(target)))))
+ $(eval $(call TOOLS_STAGE_N_TARGET,2,3,$(host),$(target)))	\
+ $(eval $(call TOOLS_STAGE_N_TARGET,3,bogus,$(host),$(target)))))
 
 $(foreach host,$(CFG_HOST_TRIPLES),				\
  $(eval $(call TOOLS_STAGE_N_HOST,0,1,$(host),$(host)))	\