Skip to content

Commit

Permalink
Fix parallel build with rust-auto-clean-trigger
Browse files Browse the repository at this point in the history
  • Loading branch information
sanxiyn committed Oct 14, 2013
1 parent fc9fdf3 commit 3fa4648
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile.in
Expand Up @@ -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

Expand All @@ -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 $@

Expand Down Expand Up @@ -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

Expand Down

4 comments on commit 3fa4648

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from jdm
at sanxiyn@3fa4648

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.