mk: Include all bins in the windows install

diff --git a/mk/dist.mk b/mk/dist.mk
index 912b692a247e2be0254432049b50740b287f41e2..cb5b3607fca87c1272aae151ab47ccaeb43b71d7 100644 (file)
--- 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 7b50441b3c7f2f4a483649f651f031c5aae2c5be..0a901358ac1f07f91ee42a3d6859fe7721d634d7 100644 (file)
--- 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)))        \