From f0e5e565336c9f481360edfce1773938543287d8 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@dbsoft.org>
Date: Thu, 28 Apr 2022 14:21:17 -0500
Subject: [PATCH] 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.

---
 toolkit/components/startup/moz.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build
index b12fe9a534..5a922dd857 100644
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -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'