diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-07 10:20:41 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-07 10:20:41 +0100 |
| commit | 0fddf6e728ddea66a463e1ccd007aa9d48498905 (patch) | |
| tree | 65e28a16bbfcf1747ca41a6a808136ee578735d9 /toolkit/library/moz.build | |
| parent | 210d6a87a2759887ce286288ab0815cbd0439e5a (diff) | |
| parent | 18159927e8f37a1858f9757803b20744fcfff505 (diff) | |
| download | UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.gz UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.lz UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.tar.xz UXP-0fddf6e728ddea66a463e1ccd007aa9d48498905.zip | |
Merge branch 'release' into Pale_Moon-release
Diffstat (limited to 'toolkit/library/moz.build')
| -rw-r--r-- | toolkit/library/moz.build | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index ba7fb5032..ebba07b4a 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -24,12 +24,7 @@ def Libxul(name): DELAYLOAD_DLLS += [ 'comdlg32.dll', - 'dbghelp.dll', 'netapi32.dll', - 'PowrProf.dll', - 'psapi.dll', - 'rasapi32.dll', - 'rasdlg.dll', 'secur32.dll', 'wininet.dll', 'winspool.drv' @@ -63,11 +58,6 @@ def Libxul(name): if CONFIG['MOZ_NEEDS_LIBATOMIC']: OS_LIBS += ['atomic'] - # This option should go away in bug 1290972, but we need to wait until - # Rust 1.12 has been released. - if CONFIG['MOZ_RUST'] and CONFIG['OS_ARCH'] == 'Darwin': - LDFLAGS += ['-Wl,-no_compact_unwind'] - Libxul('xul') SDK_LIBRARY = True @@ -241,7 +231,7 @@ OS_LIBS += CONFIG['ICONV_LIBS'] if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'): OS_LIBS += CONFIG['TK_LIBS'] -if CONFIG['OS_ARCH'] == 'OpenBSD': +if CONFIG['MOZ_SNDIO']: OS_LIBS += [ 'sndio', ] @@ -270,6 +260,13 @@ if CONFIG['MOZ_ENABLE_STARTUP_NOTIFICATION']: if CONFIG['MOZ_ENABLE_LIBPROXY']: OS_LIBS += CONFIG['MOZ_LIBPROXY_LIBS'] +if CONFIG['OS_ARCH'] == 'SunOS': + OS_LIBS += [ + 'elf', + 'demangle', + 'sendfile', + ] + if CONFIG['OS_ARCH'] == 'FreeBSD': OS_LIBS += [ 'util', |