From ed8eebd99b65c54d95ce4302ddff1633ed96549b Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 8 Apr 2015 13:17:46 -0700
Subject: [PATCH] configure: Rename --enable-debug to --enable-debug-assertions

---
 configure  | 4 ++--
 mk/main.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 51e9ad7d88e..6564c8c26e4 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-<#!/bin/sh
+#!/bin/sh
 
 msg() {
     echo "configure: $1"
@@ -534,7 +534,7 @@ opt optimize-llvm 1 "build optimized LLVM"
 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 1 "build LLVM with assertions"
-opt debug 1 "build with extra debug fun"
+opt debug-assertions 1 "build with extra debug fun"
 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 b9f2cf1cce8..4428dcc43c8 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -126,10 +126,10 @@ endif
 
 CFG_JEMALLOC_FLAGS += $(JEMALLOC_FLAGS)
 
-ifdef CFG_DISABLE_DEBUG
+ifdef CFG_DISABLE_DEBUG_ASSERTIONS
   CFG_RUSTC_FLAGS += --cfg ndebug
 else
-  $(info cfg: enabling more debugging (CFG_ENABLE_DEBUG))
+  $(info cfg: enabling more debugging (CFG_ENABLE_DEBUG_ASSERTIONS))
   CFG_RUSTC_FLAGS += --cfg debug -C debug-assertions=on
 endif