Skip to content

Commit

Permalink
mk: Include all bins in the windows install
Browse files Browse the repository at this point in the history
  • Loading branch information
@brson
brson committed Jun 28, 2013
1 parent 59905d1 commit 6511fe4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mk/dist.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion mk/tools.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))) \
Expand Down

5 comments on commit 6511fe4

@bors
Copy link
Contributor

@bors bors commented on 6511fe4 Jun 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at brson@6511fe4

@bors
Copy link
Contributor

@bors bors commented on 6511fe4 Jun 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/winver = 6511fe4 into auto

@bors
Copy link
Contributor

@bors bors commented on 6511fe4 Jun 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/winver = 6511fe4 merged ok, testing candidate = 5d2e565

@bors
Copy link
Contributor

@bors bors commented on 6511fe4 Jun 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 5d2e565

Please sign in to comment.