Skip to content
Permalink
Browse files

Fix parallel build with rust-auto-clean-trigger

  • Loading branch information...
sanxiyn committed Oct 14, 2013
1 parent fc9fdf3 commit 3fa46480e1f3a3c5333586f02f590c4c299ea0b9
Showing with 3 additions and 3 deletions.
  1. +3 −3 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

4 comments on commit 3fa4648

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Oct 14, 2013

saw approval from jdm
at sanxiyn@3fa4648

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Oct 14, 2013

merging sanxiyn/servo/fix-stamp = 3fa4648 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Oct 14, 2013

sanxiyn/servo/fix-stamp = 3fa4648 merged ok, testing candidate = cf96bf5

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Oct 14, 2013

Please sign in to comment.
You can’t perform that action at this time.