Bug 1206801 - fix broken CONFIG['DEBUG'] checks in moz.build files. r=mshal, a=lizzard
authorNathan Froyd <froydnj@mozilla.com>
Mon, 21 Sep 2015 22:32:15 -0400
changeset 297830 4353ea1e784e6bc70e43df36eaba4eac497e7cc0
parent 297829 22bb71109bd6ff13422c26ecee1cb4dd018ee5da
child 297831 a363a3510295ceaa61afb325d4e257b669dd83f2
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, lizzard
bugs1206801
milestone43.0a2
Bug 1206801 - fix broken CONFIG['DEBUG'] checks in moz.build files. r=mshal, a=lizzard 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
widget/cocoa/moz.build
xulrunner/app/moz.build
--- a/webapprt/win/moz.build
+++ b/webapprt/win/moz.build
@@ -9,18 +9,16 @@
 # executable, as we copy it to arbitrary locations.
 Program('webapprt-stub')
 
 SOURCES += [
     'webapprt.cpp',
 ]
 
 DEFINES['XPCOM_GLUE'] = True
-if CONFIG['DEBUG']:
-    DEFINES['DEBUG'] = True
 
 DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION']
 
 # Statically link against the CRT
 USE_STATIC_LIBS = True
 
 GENERATED_INCLUDES += ['/build']
 LOCAL_INCLUDES += [
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -65,17 +65,17 @@ UNIFIED_SOURCES += [
 SOURCES += [
     'nsChildView.mm',
     'nsClipboard.mm',
     'nsCocoaDebugUtils.mm',
     'nsDragService.mm',
     'nsNativeThemeCocoa.mm',
 ]
 
-if not CONFIG['RELEASE_BUILD'] or CONFIG['DEBUG']:
+if not CONFIG['RELEASE_BUILD'] or CONFIG['MOZ_DEBUG']:
     SOURCES += [
         'nsSandboxViolationSink.mm',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 # XXX: We should fix these warnings.
 ALLOW_COMPILER_WARNINGS = True
--- a/xulrunner/app/moz.build
+++ b/xulrunner/app/moz.build
@@ -8,17 +8,17 @@ DIRS += ['profile']
 
 GeckoProgram('xulrunner')
 
 SOURCES += [
     'nsXULRunnerApp.cpp',
 ]
 
 DEFINES['XULRUNNER_PROGNAME'] = '"xulrunner"'
-if CONFIG['DEBUG']:
+if CONFIG['MOZ_DEBUG']:
     DEFINES['DEBUG'] = True
 
 LOCAL_INCLUDES += [
     '/toolkit/profile',
     '/toolkit/xre',
     '/xpcom/base',
     '/xpcom/build',
 ]