summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-03-30 20:03:33 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-03-30 20:03:33 +0100
commit6b968b13d9cab02d8634facc87ae39e51dee4020 (patch)
treeb84b2c122ce39dedbd8286bb6c7aba3aca51b964 /toolkit
parent25779d371c571e4f51792af3e3c5588b3186e934 (diff)
downloadUXP-6b968b13d9cab02d8634facc87ae39e51dee4020.tar
UXP-6b968b13d9cab02d8634facc87ae39e51dee4020.tar.gz
UXP-6b968b13d9cab02d8634facc87ae39e51dee4020.tar.lz
UXP-6b968b13d9cab02d8634facc87ae39e51dee4020.tar.xz
UXP-6b968b13d9cab02d8634facc87ae39e51dee4020.zip
Issue #187: Remove solaris 1st party code OS checks.
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/components/osfile/modules/osfile_unix_back.jsm15
-rw-r--r--toolkit/library/moz.build9
2 files changed, 4 insertions, 20 deletions
diff --git a/toolkit/components/osfile/modules/osfile_unix_back.jsm b/toolkit/components/osfile/modules/osfile_unix_back.jsm
index a028dda7d..bf5c66b8d 100644
--- a/toolkit/components/osfile/modules/osfile_unix_back.jsm
+++ b/toolkit/components/osfile/modules/osfile_unix_back.jsm
@@ -585,17 +585,10 @@
} else if (Const._STAT_VER != undefined) {
const ver = Const._STAT_VER;
let xstat_name, lxstat_name, fxstat_name;
- if (OS.Constants.Sys.Name == "SunOS") {
- // Solaris
- xstat_name = "_xstat";
- lxstat_name = "_lxstat";
- fxstat_name = "_fxstat";
- } else {
- // Linux, all widths
- xstat_name = "__xstat";
- lxstat_name = "__lxstat";
- fxstat_name = "__fxstat";
- }
+ // Linux, all widths
+ xstat_name = "__xstat";
+ lxstat_name = "__lxstat";
+ fxstat_name = "__fxstat";
let Stat = {};
libc.declareLazyFFI(Stat, "xstat",
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 5191b5a21..ba7fb5032 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -270,15 +270,6 @@ 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',
- ]
- if CONFIG['GNU_CC']:
- OS_LIBS += [
- 'demangle',
- ]
-
if CONFIG['OS_ARCH'] == 'FreeBSD':
OS_LIBS += [
'util',