From 7cbf8233539d74b9c6a3b1bdc67c66bfb9e0ce7e Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 8 Apr 2015 13:57:37 -0700
Subject: [PATCH] configure: Add --enable-debuginfo

---
 configure  | 1 +
 mk/main.mk | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/configure b/configure
index 8620e1425d0..3fe9d543c5d 100755
--- a/configure
+++ b/configure
@@ -535,6 +535,7 @@ opt optimize-tests 1 "build tests with optimizations"
 opt libcpp 1 "build with llvm with libc++ instead of libstdc++ when using clang"
 opt llvm-assertions 0 "build LLVM with assertions"
 opt debug-assertions 0 "build with debugging assertions"
+opt debuginfo 0 "build with debugger metadata"
 opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
 opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
 opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
diff --git a/mk/main.mk b/mk/main.mk
index 98b9dda1251..ea00444453d 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -133,6 +133,11 @@ else
   CFG_RUSTC_FLAGS += --cfg ndebug
 endif
 
+ifdef CFG_ENABLE_DEBUGINFO
+  $(info cfg: enabling debuginfo (CFG_ENABLE_DEBUGINFO))
+  CFG_RUSTC_FLAGS += -g
+endif
+
 ifdef SAVE_TEMPS
   CFG_RUSTC_FLAGS += --save-temps
 endif