Skip to content

Commit

Permalink
auto merge of #9542 : pnkfelix/rust/fsk-fix-issue-9531, r=thestinger
Browse files Browse the repository at this point in the history
r? strcat 

(please double check that it fixes things on your chroot, if possible, before approval)

Fix #9531
  • Loading branch information
bors committed Sep 28, 2013
2 parents 9cc11ca + 2835df2 commit 92e7bb6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,10 @@ config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
# Primary-target makefiles
######################################################################

# Issue #9531: If you change the order of any of the following (or add
# new definitions), make sure definitions always precede their uses,
# especially for the dependency lists of recipes.

include $(CFG_SRC_DIR)mk/target.mk
include $(CFG_SRC_DIR)mk/host.mk
include $(CFG_SRC_DIR)mk/stage0.mk
Expand Down
2 changes: 0 additions & 2 deletions mk/stage0.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ $(HBIN0_H_$(CFG_BUILD_TRIPLE))/:
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/:
mkdir -p $@

SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))

$(SNAPSHOT_RUSTC_POST_CLEANUP): \
$(S)src/snapshots.txt \
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
Expand Down
2 changes: 2 additions & 0 deletions mk/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ WFLAGS_ST2 = -D warnings
# had its chance to clean it out; otherwise the other products will be
# inadvertantly included in the clean out.

SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))

define TARGET_STAGE_N

$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
Expand Down

0 comments on commit 92e7bb6

Please sign in to comment.