From 3fa46480e1f3a3c5333586f02f590c4c299ea0b9 Mon Sep 17 00:00:00 2001 From: Seo Sanghyeon Date: Mon, 14 Oct 2013 19:13:34 +0900 Subject: [PATCH 1/2] Fix parallel build with rust-auto-clean-trigger --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index d2acdfb3be5..2ed8a76e21d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -94,7 +94,7 @@ $(S)config.stamp : $(S)configure $(S)Makefile.in # Build the compiler ifneq ($(CFG_LOCAL_RUSTC),1) -$(CFG_RUSTC): +$(CFG_RUSTC): $(B)src/compiler/rust/rust-auto-clean-stamp @$(call E, building rustc) $(Q)CFG_RUSTC_FLAGS= CFG_ENABLE_DEBUG= RUSTFLAGS= $(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust" CC=gcc CXX=g++ LD=ld AR=ar @@ -109,7 +109,7 @@ clean-rust: endif -$(B)/src/compiler/rust/rust-auto-clean-stamp: $(S)src/compiler/rust-auto-clean-trigger +$(B)src/compiler/rust/rust-auto-clean-stamp: $(S)src/compiler/rust-auto-clean-trigger $(Q)$(MAKE) clean-rust touch $@ @@ -247,7 +247,7 @@ DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_util) $(DONE_ .DEFAULT_GOAL := all .PHONY: all -all: $(B)/src/compiler/rust/rust-auto-clean-stamp servo package +all: servo package # Servo helper libraries From f90d12486ebcc6638d9dadd343220c71c98998bb Mon Sep 17 00:00:00 2001 From: Seo Sanghyeon Date: Mon, 14 Oct 2013 20:28:09 +0900 Subject: [PATCH 2/2] Trigger Rust --- src/compiler/rust-auto-clean-trigger | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/rust-auto-clean-trigger b/src/compiler/rust-auto-clean-trigger index db2e263074a..cd080b46feb 100644 --- a/src/compiler/rust-auto-clean-trigger +++ b/src/compiler/rust-auto-clean-trigger @@ -1,4 +1,4 @@ # If this file is modified, then rust will be forcibly cleaned and then rebuilt. # The actual contents of this file do not matter, but to trigger a change on the # build bots then the contents should be changed so git updates the mtime. -2013-09-06 +2013-10-14