diff options
| author | bors <bors@rust-lang.org> | 2013-09-28 15:01:38 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-28 15:01:38 -0700 |
| commit | 92e7bb67a8038ff73ad9dc88d8be3d3df4777282 (patch) | |
| tree | 36b2d2327449707f96fdb0f4cf088e5806baa852 | |
| parent | 9cc11ca6a31e05c75cd40097b38d6f735254e12c (diff) | |
| parent | 2835df2db65b1c03f3f21f553b8f31db0fb1b6c0 (diff) | |
| download | rust-92e7bb67a8038ff73ad9dc88d8be3d3df4777282.tar.gz rust-92e7bb67a8038ff73ad9dc88d8be3d3df4777282.zip | |
auto merge of #9542 : pnkfelix/rust/fsk-fix-issue-9531, r=thestinger
r? strcat (please double check that it fixes things on your chroot, if possible, before approval) Fix #9531
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | mk/stage0.mk | 2 | ||||
| -rw-r--r-- | mk/target.mk | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 9114c9da121..b573ab9d4bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/mk/stage0.mk b/mk/stage0.mk index b11dca3aa06..c1b0242bbc6 100644 --- a/mk/stage0.mk +++ b/mk/stage0.mk @@ -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) \ diff --git a/mk/target.mk b/mk/target.mk index e540d856ecd..8592f7968c8 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -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: \ |