From 11d6bd3c471e31f5a9ac378fd25013b631b15d3f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 3 Feb 2016 17:48:49 +0900
Subject: [PATCH] Bug 1245422 - Remove -UDEBUG -DNDEBUG flags on Windows opt
 builds. r=mshal

-DNDEBUG is already set through MOZ_DEBUG_DEFINES, and -UDEBUG is not
doing anything useful, since nothing is setting DEBUG on the command
line, nor does the compiler by default.
---
 config/config.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index ec3c4bc3425..f95c0c8dde0 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -195,8 +195,6 @@ ifndef MOZ_DEBUG
 # Used for generating an optimized build with debugging symbols.
 # Used in the Windows nightlies to generate symbols for crash reporting.
 ifdef MOZ_DEBUG_SYMBOLS
-OS_CXXFLAGS += -UDEBUG -DNDEBUG
-OS_CFLAGS += -UDEBUG -DNDEBUG
 ifdef HAVE_64BIT_BUILD
 OS_LDFLAGS += -DEBUG -OPT:REF,ICF
 else
@@ -209,7 +207,7 @@ endif
 # No opt to give sane callstacks.
 #
 ifdef MOZ_DMD
-MOZ_OPTIMIZE_FLAGS=-Zi -Od -UDEBUG -DNDEBUG
+MOZ_OPTIMIZE_FLAGS=-Zi -Od
 ifdef HAVE_64BIT_BUILD
 OS_LDFLAGS = -DEBUG -OPT:REF,ICF
 else