From 72875ce99559512492f1c024917ea4544b00673d Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Fri, 12 Jul 2013 11:06:27 -0600 Subject: [PATCH 1/2] Bump rust-mozjs pointer to the merge commit. --- src/support/spidermonkey/rust-mozjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/support/spidermonkey/rust-mozjs b/src/support/spidermonkey/rust-mozjs index 372622906d1..df2b9ae514b 160000 --- a/src/support/spidermonkey/rust-mozjs +++ b/src/support/spidermonkey/rust-mozjs @@ -1 +1 @@ -Subproject commit 372622906d112ae28825be1d5fcd8737cd03ae58 +Subproject commit df2b9ae514ba76c616e7f58d9de0da545512cfe0 From 7fe380d82118c4f8050f19d3bb92d822f63d0672 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Fri, 12 Jul 2013 11:10:05 -0600 Subject: [PATCH 2/2] Move rust-auto-clean-stamp into the rust build dir. This is needed so that it's backed up and restored along with the rust build products. --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index ec8d12071fd..d53494f634b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,7 +91,7 @@ clean-rust: endif -src/compiler/rust-auto-clean-stamp: $(S)src/compiler/rust-auto-clean-trigger +src/compiler/rust/rust-auto-clean-stamp: $(S)src/compiler/rust-auto-clean-trigger $(Q)$(MAKE) clean-rust touch $@ @@ -227,7 +227,7 @@ include $(S)mk/clean.mk .DEFAULT_GOAL := all .PHONY: all -all: src/compiler/rust-auto-clean-stamp servo package +all: src/compiler/rust/rust-auto-clean-stamp servo package # Servo helper libraries