From 156399b67fd55c5eb51794c0b67c22d5525bdf6e Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 21 Sep 2015 22:32:15 -0400
Subject: [PATCH] Bug 1206801 - fix broken CONFIG['DEBUG'] checks in moz.build
 files; r=mshal

These were supposed to be CONFIG['MOZ_DEBUG'].  webapprt doesn't use the
define it set up, however, so it was deleted rather than fixed.
---
 webapprt/win/moz.build  | 2 --
 widget/cocoa/moz.build  | 2 +-
 xulrunner/app/moz.build | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/webapprt/win/moz.build b/webapprt/win/moz.build
index 9b37940d17ad..9c159253e53c 100644
--- a/webapprt/win/moz.build
+++ b/webapprt/win/moz.build
@@ -14,8 +14,6 @@ SOURCES += [
 ]
 
 DEFINES['XPCOM_GLUE'] = True
-if CONFIG['DEBUG']:
-    DEFINES['DEBUG'] = True
 
 DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION']
 
diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build
index 0979cb909ff9..5e918d252607 100644
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -70,7 +70,7 @@ SOURCES += [
     'nsNativeThemeCocoa.mm',
 ]
 
-if not CONFIG['RELEASE_BUILD'] or CONFIG['DEBUG']:
+if not CONFIG['RELEASE_BUILD'] or CONFIG['MOZ_DEBUG']:
     SOURCES += [
         'nsSandboxViolationSink.mm',
     ]
diff --git a/xulrunner/app/moz.build b/xulrunner/app/moz.build
index f8b75599c3f7..0195a439906f 100644
--- a/xulrunner/app/moz.build
+++ b/xulrunner/app/moz.build
@@ -13,7 +13,7 @@ SOURCES += [
 ]
 
 DEFINES['XULRUNNER_PROGNAME'] = '"xulrunner"'
-if CONFIG['DEBUG']:
+if CONFIG['MOZ_DEBUG']:
     DEFINES['DEBUG'] = True
 
 LOCAL_INCLUDES += [