--- a/make/common/Defs-linux.gmk	Wed Jul 08 12:07:43 2009 +0800
+++ b/make/common/Defs-linux.gmk	Wed Jul 08 09:11:24 2009 -0700
@@ -193,7 +193,7 @@ CPPFLAGS_COMMON += -D_LP64=1
 CPPFLAGS_COMMON += -D_LP64=1
 endif
 
-CPPFLAGS_OPT    = 
+CPPFLAGS_OPT    = -DNDEBUG
 CPPFLAGS_DBG    = -DDEBUG
 ifneq ($(PRODUCT), java)
   CPPFLAGS_DBG    += -DLOGGING 

--- a/make/common/Defs-windows.gmk	Wed Jul 08 12:07:43 2009 +0800
+++ b/make/common/Defs-windows.gmk	Wed Jul 08 09:11:24 2009 -0700
@@ -363,7 +363,7 @@ ifeq ($(COMPILER_WARNINGS_FATAL),true)
   CFLAGS_COMMON += -WX
 endif
 
-CPPFLAGS_OPT    = 
+CPPFLAGS_OPT    = -DNDEBUG
 CPPFLAGS_DBG    = -DDEBUG -DLOGGING
 
 CXXFLAGS_COMMON = $(CFLAGS_COMMON)