dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Stop building stage3 on normal test cycles 

Issue #1419
This commit is contained in:
Haitao Li 2012-01-16 13:42:03 +08:00
parent 498ad91d06
commit 394a80cfd8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -397,7 +397,7 @@ rustc-stage3: rustc-stage3-H-$(CFG_HOST_TRIPLE)
define DEF_RUSTC_TARGET define DEF_RUSTC_TARGET
# $(1) == architecture # $(1) == architecture
rustc-H-$(1): rustc-stage3-H-$(1) rustc-H-$(1): rustc-stage2-H-$(1)
endef endef
$(foreach host,$(CFG_TARGET_TRIPLES), \ $(foreach host,$(CFG_TARGET_TRIPLES), \

9
mk/install.mk
View File

@ -14,7 +14,7 @@ else
endif endif
# The stage we install from # The stage we install from
ISTAGE = 3 ISTAGE = 2
PREFIX_ROOT = $(CFG_PREFIX) PREFIX_ROOT = $(CFG_PREFIX)
PREFIX_BIN = $(PREFIX_ROOT)/bin PREFIX_BIN = $(PREFIX_ROOT)/bin
@ -56,6 +56,7 @@ install: all install-host install-targets
# Shorthand for build/stageN/bin # Shorthand for build/stageN/bin
HB = $(HBIN$(ISTAGE)_H_$(CFG_HOST_TRIPLE)) HB = $(HBIN$(ISTAGE)_H_$(CFG_HOST_TRIPLE))
HB3 = $(HBIN3_H_$(CFG_HOST_TRIPLE))
# Shorthand for build/stageN/lib # Shorthand for build/stageN/lib
HL = $(HLIB$(ISTAGE)_H_$(CFG_HOST_TRIPLE)) HL = $(HLIB$(ISTAGE)_H_$(CFG_HOST_TRIPLE))
# Shorthand for the prefix bin directory # Shorthand for the prefix bin directory
@ -67,9 +68,9 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
$(Q)mkdir -p $(PREFIX_BIN) $(Q)mkdir -p $(PREFIX_BIN)
$(Q)mkdir -p $(PREFIX_LIB) $(Q)mkdir -p $(PREFIX_LIB)
$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1 $(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
$(Q)$(call INSTALL,$(HB),$(PHB),rustc$(X)) $(Q)$(call INSTALL,$(HB3),$(PHB),rustc$(X))
$(Q)$(call INSTALL,$(HB),$(PHB),cargo$(X)) $(Q)$(call INSTALL,$(HB3),$(PHB),cargo$(X))
$(Q)$(call INSTALL,$(HB),$(PHB),rustdoc$(X)) $(Q)$(call INSTALL,$(HB3),$(PHB),rustdoc$(X))
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME)) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))

2
mk/tests.mk
View File

@ -70,7 +70,7 @@ endif
# Main test targets # Main test targets
###################################################################### ######################################################################
check: all tidy check-stage3 \ check: all tidy check-stage2 \
check-full: all tidy check-stage1 check-stage2 check-stage3 \ check-full: all tidy check-stage1 check-stage2 check-stage3 \