From 0f1bfda00663e935cbaad278acc69142aa0703e7 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 21 Apr 2015 19:35:05 -0700
Subject: [PATCH 1/2] Alphabetize

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 18fef588936..eb9a08fe49b 100755
--- a/configure
+++ b/configure
@@ -650,9 +650,9 @@ if [ -n "$CFG_ENABLE_DEBUG" ]; then
         CFG_DISABLE_OPTIMIZE=1
         CFG_DISABLE_OPTIMIZE_CXX=1
     fi
-    CFG_ENABLE_LLVM_ASSERTIONS=1
     CFG_ENABLE_DEBUG_ASSERTIONS=1
     CFG_ENABLE_DEBUG_JEMALLOC=1
+    CFG_ENABLE_LLVM_ASSERTIONS=1
 fi
 
 # OK, now write the debugging options

From 98f4221d496a4fd69d47b23d0540f2342e48a166 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 21 Apr 2015 19:35:11 -0700
Subject: [PATCH 2/2] `--enable-debug` adds `-g`. Closes #7205

---
 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index eb9a08fe49b..be173c5008b 100755
--- a/configure
+++ b/configure
@@ -652,6 +652,7 @@ if [ -n "$CFG_ENABLE_DEBUG" ]; then
     fi
     CFG_ENABLE_DEBUG_ASSERTIONS=1
     CFG_ENABLE_DEBUG_JEMALLOC=1
+    CFG_ENABLE_DEBUGINFO=1
     CFG_ENABLE_LLVM_ASSERTIONS=1
 fi