From 174838f7f90d713a0bc73159a44651e153f7bb88 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sun, 23 Oct 2016 10:20:48 -0700
Subject: [PATCH 1/2] mk: Filter debuginfo=1 from test flags

Fixes tests with `--enable-debuginfo-lines`.
---
 mk/main.mk  | 2 +-
 mk/tests.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mk/main.mk b/mk/main.mk
index d45e59d9b7806..a5e3764122003 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -144,7 +144,7 @@ ifdef CFG_ENABLE_DEBUGINFO
   CFG_RUSTC_FLAGS += -g
 else ifdef CFG_ENABLE_DEBUGINFO_LINES
   $(info cfg: enabling line number debuginfo (CFG_ENABLE_DEBUGINFO_LINES))
-  CFG_RUSTC_FLAGS += -C debuginfo=1
+  CFG_RUSTC_FLAGS += -Cdebuginfo=1
 endif
 
 ifdef SAVE_TEMPS
diff --git a/mk/tests.mk b/mk/tests.mk
index fc1f4b5561a78..1957c989eb0d4 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -632,6 +632,7 @@ endif
 # is a separate choice from whether to pass `-g` when building the
 # compiler and standard library themselves.
 CTEST_RUSTC_FLAGS := $$(subst -g,,$$(CTEST_RUSTC_FLAGS))
+CTEST_RUSTC_FLAGS := $$(subst -Cdebuginfo=1,,$$(CTEST_RUSTC_FLAGS))
 ifdef CFG_ENABLE_DEBUGINFO_TESTS
 CTEST_RUSTC_FLAGS += -g
 endif

From f96a4cca8126341d58c816df03a5ead8b6628e33 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sun, 23 Oct 2016 10:25:01 -0700
Subject: [PATCH 2/2] configure: Disable debuginfo lines on MinGW

Looks like these are causing assertions on the bots, let's disable them for now
(#37364).
---
 configure | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index ceb67869efeef..2bc8c72e3ea1c 100755
--- a/configure
+++ b/configure
@@ -722,11 +722,25 @@ case "$CFG_RELEASE_CHANNEL" in
     nightly )
 	msg "overriding settings for $CFG_RELEASE_CHANNEL"
 	CFG_ENABLE_LLVM_ASSERTIONS=1
-	CFG_ENABLE_DEBUGINFO_LINES=1
+
+        # FIXME(#37364) shouldn't have to disable this on windows-gnu
+        case "$CFG_BUILD" in
+          *-pc-windows-gnu)
+            ;;
+          *)
+	    CFG_ENABLE_DEBUGINFO_LINES=1
+            ;;
+        esac
 	;;
     beta | stable)
 	msg "overriding settings for $CFG_RELEASE_CHANNEL"
-	CFG_ENABLE_DEBUGINFO_LINES=1
+        case "$CFG_BUILD" in
+          *-pc-windows-gnu)
+            ;;
+          *)
+	    CFG_ENABLE_DEBUGINFO_LINES=1
+            ;;
+        esac
 	;;
     dev)
 	;;