From 8f74a3122c7fac1ef25709fca288f872277220ef Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Wed, 4 Sep 2013 14:02:43 -0700
Subject: [PATCH 1/2] sub.mk: Remove CFLAGS_mozjs

Seems to have no effect.
---
 mk/sub.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mk/sub.mk b/mk/sub.mk
index 1c155d6de09..266295d519a 100644
--- a/mk/sub.mk
+++ b/mk/sub.mk
@@ -83,10 +83,6 @@ DEPS_rust-css += \
 	rust-wapcaplet \
 	$(NULL)
 
-CFLAGS_mozjs += \
-	"-I../mozjs/dist/include" \
-	$(NULL)
-
 DEPS_rust-mozjs += \
 	mozjs \
 	$(NULL)

From db0bffe0a08274184341a64b443b3d91b7bd9f7c Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Wed, 4 Sep 2013 14:10:59 -0700
Subject: [PATCH 2/2] Add SpiderMonkey debug build fix

---
 src/support/spidermonkey/mozjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/support/spidermonkey/mozjs b/src/support/spidermonkey/mozjs
index 50f2e99633b..15c494b9204 160000
--- a/src/support/spidermonkey/mozjs
+++ b/src/support/spidermonkey/mozjs
@@ -1 +1 @@
-Subproject commit 50f2e99633bf28f24b284821dbb723b38f2756e0
+Subproject commit 15c494b9204bb4ecdfbeab142c0ea01e5f0c9a1b