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
This commit is contained in:
commit
92e7bb67a8
|
@ -608,6 +608,10 @@ config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
|
||||||
# Primary-target makefiles
|
# 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/target.mk
|
||||||
include $(CFG_SRC_DIR)mk/host.mk
|
include $(CFG_SRC_DIR)mk/host.mk
|
||||||
include $(CFG_SRC_DIR)mk/stage0.mk
|
include $(CFG_SRC_DIR)mk/stage0.mk
|
||||||
|
|
|
@ -6,8 +6,6 @@ $(HBIN0_H_$(CFG_BUILD_TRIPLE))/:
|
||||||
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/:
|
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/:
|
||||||
mkdir -p $@
|
mkdir -p $@
|
||||||
|
|
||||||
SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))
|
|
||||||
|
|
||||||
$(SNAPSHOT_RUSTC_POST_CLEANUP): \
|
$(SNAPSHOT_RUSTC_POST_CLEANUP): \
|
||||||
$(S)src/snapshots.txt \
|
$(S)src/snapshots.txt \
|
||||||
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
|
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
|
||||||
|
|
|
@ -36,6 +36,8 @@ WFLAGS_ST2 = -D warnings
|
||||||
# had its chance to clean it out; otherwise the other products will be
|
# had its chance to clean it out; otherwise the other products will be
|
||||||
# inadvertantly included in the clean out.
|
# inadvertantly included in the clean out.
|
||||||
|
|
||||||
|
SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))
|
||||||
|
|
||||||
define TARGET_STAGE_N
|
define TARGET_STAGE_N
|
||||||
|
|
||||||
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
|
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
|
||||||
|
|
Loading…
Reference in New Issue