Bug 1206801 - fix broken CONFIG['DEBUG'] checks in moz.build files; r+a=bustage
authorNathan Froyd <froydnj@mozilla.com>
Mon, 21 Sep 2015 23:10:49 -0400
changeset 289331 a91c7eca550896b7d16717468759e2cb58176df9
parent 289330 651a0b2fc204e331b7b0cee3cb7bd7bd591f5c51
child 289332 57acc798876df7097b6d59af7fef2201eb4eb70f
child 289334 09da4bee8f1c92ed4bbcca16cbd22c7f34d670f9
child 289335 a5dca53807c6a0a645e6394d96c1a822468cf8ed
push id5071
push usernfroyd@mozilla.com
push dateMon, 21 Sep 2015 19:13:07 +0000
treeherdermozilla-beta@a91c7eca5508 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1206801
milestone42.0
Bug 1206801 - fix broken CONFIG['DEBUG'] checks in moz.build files; r+a=bustage
webapprt/win/moz.build
widget/cocoa/moz.build
xulrunner/app/moz.build
--- a/webapprt/win/moz.build
+++ b/webapprt/win/moz.build
@@ -9,17 +9,17 @@
 # executable, as we copy it to arbitrary locations.
 Program('webapprt-stub')
 
 SOURCES += [
     'webapprt.cpp',
 ]
 
 DEFINES['XPCOM_GLUE'] = True
-if CONFIG['DEBUG']:
+if CONFIG['MOZ_DEBUG']:
     DEFINES['DEBUG'] = True
 
 DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION']
 
 # Statically link against the CRT
 USE_STATIC_LIBS = True
 
 GENERATED_INCLUDES += ['/build']
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -64,17 +64,17 @@ UNIFIED_SOURCES += [
 
 # These files cannot be built in unified mode because they cause symbol conflicts
 SOURCES += [
     'nsChildView.mm',
     'nsClipboard.mm',
     'nsCocoaDebugUtils.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')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
--- 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',
 ]