diff options
author | Moonchild <mcwerewolf@gmail.com> | 2018-10-24 06:40:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-24 06:40:38 +0200 |
commit | afe69140a8485b271d8f6ac1d7551540cea11c66 (patch) | |
tree | 578f23631e84aff1c50bb9c5c5e7999475fad607 /toolkit/components/startup/moz.build | |
parent | d07a4f2ba9295068681ecfb8e36418f6b72c3d56 (diff) | |
download | UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.tar UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.tar.gz UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.tar.lz UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.tar.xz UXP-afe69140a8485b271d8f6ac1d7551540cea11c66.zip |
Revert "Make nsIUserInfo component optional with --disable-userinfo at build time"
Diffstat (limited to 'toolkit/components/startup/moz.build')
-rw-r--r-- | toolkit/components/startup/moz.build | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index 5f290b783..dbd580384 100644 --- a/toolkit/components/startup/moz.build +++ b/toolkit/components/startup/moz.build @@ -18,14 +18,19 @@ UNIFIED_SOURCES += [ 'StartupTimeline.cpp', ] -if CONFIG['MOZ_USERINFO']: - if 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': - UNIFIED_SOURCES += ['nsUserInfoMac.mm'] - else: - UNIFIED_SOURCES += ['nsUserInfoUnix.cpp'] +if 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': + UNIFIED_SOURCES += [ + 'nsUserInfoMac.mm', + ] +else: + UNIFIED_SOURCES += [ + 'nsUserInfoUnix.cpp', + ] FINAL_LIBRARY = 'xul' |