From f46b57252ebecbcb5d9a33caf6091119aca525a2 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 24 Sep 2014 17:46:36 -0700
Subject: [PATCH 1/2] mk: Fix a minor makefile warning on windows

---
 mk/stage0.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mk/stage0.mk b/mk/stage0.mk
index 4edd9118a56..e028bba73da 100644
--- a/mk/stage0.mk
+++ b/mk/stage0.mk
@@ -3,8 +3,11 @@
 $(HBIN0_H_$(CFG_BUILD))/:
 	mkdir -p $@
 
+# On windows these two are the same, so cause a redifinition warning
+ifneq ($(HBIN0_H_$(CFG_BUILD)),$(HLIB0_H_$(CFG_BUILD)))
 $(HLIB0_H_$(CFG_BUILD))/:
 	mkdir -p $@
+endif
 
 $(SNAPSHOT_RUSTC_POST_CLEANUP): \
 		$(S)src/snapshots.txt \

From b23c128ee008bd796f8ac19ebeec103768903428 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 25 Sep 2014 13:34:16 -0700
Subject: [PATCH 2/2] configure: Fix the compatibility code for
 --enable-nightly

When --enable-nightly is not specified this expression is malformed
because $CFG_ENABLE_NIGHTLY is undefined.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index ef6da404623..54bc824b8e0 100755
--- a/configure
+++ b/configure
@@ -488,7 +488,7 @@ esac
 
 # Continue supporting the old --enable-nightly flag to transition the bots
 # XXX Remove me
-if [ $CFG_ENABLE_NIGHTLY -eq 1 ]
+if [ ! -z "$CFG_ENABLE_NIGHTLY" ]
 then
     CFG_RELEASE_CHANNEL=nightly
     putvar CFG_RELEASE_CHANNEL