Issue #1829 - Build system fixes. Readd de-unified source changes that got clobbered by commit 378738aaa9924d0b95e2c57f27cbad2b2e644282. Fix build issues using clang broken by commit 39f9ab375b2bfd9e46df9695b78870cf1e9cf3c6.

This commit is contained in:
Brian Smith 2022-04-28 14:21:17 -05:00 committed by roytam1
commit f0e5e56533

View file

@ -7,7 +7,7 @@ DIRS += ['public']
EXPORTS.mozilla += ['StartupTimeline.h']
UNIFIED_SOURCES += [
SOURCES += [
'nsAppStartup.cpp',
'StartupTimeline.cpp',
]
@ -17,8 +17,8 @@ if CONFIG['MOZ_USERINFO']:
# This file cannot be built in unified mode because of name clashes with Windows headers.
SOURCES += ['nsUserInfoWin.cpp']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
UNIFIED_SOURCES += ['nsUserInfoMac.mm']
SOURCES += ['nsUserInfoMac.mm']
else:
UNIFIED_SOURCES += ['nsUserInfoUnix.cpp']
SOURCES += ['nsUserInfoUnix.cpp']
FINAL_LIBRARY = 'xul'