Bug 943990 - Build toolkit/components/startup in unified mode; r=bsmedberg
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 03 Dec 2013 15:49:02 -0500
changeset 174302 d21baae37496ba96747266f4129c7ba15872d94c
parent 174301 e5d7b3be4516bdabaaf3e863e3206f0ab17974fa
child 174303 5bdb9cff69ccd6966201fa6c5fbdefc7bdfb3890
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs943990
milestone28.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 943990 - Build toolkit/components/startup in unified mode; r=bsmedberg
toolkit/components/startup/moz.build
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -9,33 +9,34 @@ DIRS += ['public']
 TEST_DIRS += ['tests/browser']
 
 EXPORTS.mozilla += [
     'StartupTimeline.h',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsAppStartup.cpp',
     'StartupTimeline.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     SOURCES += [
         'nsUserInfoOS2.cpp',
     ]
 elif CONFIG['OS_ARCH'] == 'WINNT':
+    # This file cannot be built in unified mode because of name clashes with Windows headers.
     SOURCES += [
         'nsUserInfoWin.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsUserInfoMac.mm',
     ]
 else:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsUserInfoUnix.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'toolkitcomps'