Bug 1245422 - Remove -UDEBUG -DNDEBUG flags on Windows opt builds. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 03 Feb 2016 17:48:49 +0900
changeset 319334 07c8d571d63b939adad6f53993ef570b0e06ecfa
parent 319333 16ade0e51193116952362c268a31beb704ea9fe6
child 319335 648e852030e3061cb18b336aafd5166b3268b5bb
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1245422
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
--- a/config/config.mk
+++ b/config/config.mk
@@ -190,31 +190,29 @@ OS_LDFLAGS += $(_DEBUG_LDFLAGS)
 # XXX: What does this? Bug 482434 filed for better explanation.
 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
 ifndef MOZ_DEBUG
 
 # MOZ_DEBUG_SYMBOLS generates debug symbols in separate PDB files.
 # 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
 OS_LDFLAGS += -DEBUG -OPT:REF
 endif
 endif
 
 #
 # Handle DMD in optimized builds.
 # 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
 OS_LDFLAGS = -DEBUG -OPT:REF
 endif
 endif # MOZ_DMD
 
 endif # MOZ_DEBUG