diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-28 14:21:17 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-28 14:21:17 -0500 |
| commit | bebeb4e26a35df99e19b6c44fc957ad6c14e9059 (patch) | |
| tree | 5e71f94a6a1185c4c9d20ff856ef0bb0c546bbf5 | |
| parent | 1eaadfbc8d0b84b00bc414f173d4291226140e52 (diff) | |
| download | uxp-bebeb4e26a35df99e19b6c44fc957ad6c14e9059.tar.gz | |
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.
| -rw-r--r-- | build/moz.configure/toolchain.configure | 3 | ||||
| -rw-r--r-- | toolkit/components/startup/moz.build | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 1f2b5ecf07..ee14ce009e 100644 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -867,7 +867,8 @@ add_old_configure_assignment('MOZ_DEBUG_FLAGS', debug_flags) # effectively does the same thing we are doing here. @depends(c_compiler, target) def libcxx_inline_visibility(c_compiler, target): - if c_compiler.type == 'clang': + # FIXME: Vestigial conditional left over from Android, please remove. + if False: return '' set_define('_LIBCPP_INLINE_VISIBILITY', libcxx_inline_visibility) 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' |