From 7d95c222448e0f74b3ff1b6df0447b3fb27e72de Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Mon, 1 Jun 2015 14:01:13 -0700
Subject: [PATCH] Stop passing the old ndebug/debug cfg directives

As of rust-lang/rust#22980 only `cfg(debug_assertions)` is used in the
standard library and rustc code.
---
 mk/main.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mk/main.mk b/mk/main.mk
index de5adfd1297..a8891ff4066 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -130,9 +130,7 @@ CFG_JEMALLOC_FLAGS += $(JEMALLOC_FLAGS)
 
 ifdef CFG_ENABLE_DEBUG_ASSERTIONS
   $(info cfg: enabling debug assertions (CFG_ENABLE_DEBUG_ASSERTIONS))
-  CFG_RUSTC_FLAGS += --cfg debug -C debug-assertions=on
-else
-  CFG_RUSTC_FLAGS += --cfg ndebug
+  CFG_RUSTC_FLAGS += -C debug-assertions=on
 endif
 
 ifdef CFG_ENABLE_DEBUGINFO