From 6b968b13d9cab02d8634facc87ae39e51dee4020 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Sat, 30 Mar 2019 20:03:33 +0100
Subject: Issue #187: Remove solaris 1st party code OS checks.

---
 toolkit/components/osfile/modules/osfile_unix_back.jsm | 15 ++++-----------
 toolkit/library/moz.build                              |  9 ---------
 2 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'toolkit')

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',
-- 
cgit v1.2.3