5 files changed, 32 insertions, 1 deletions
diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
index 89c53c52c..d3cc3113d 100644
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -35,7 +35,7 @@ if test -n "$USE_ICU"; then
         fi
     fi
 
-    version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+    version=`${TOOLCHAIN_PREFIX}sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
     if test x"$version" = x; then
        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
     fi
diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild
index 545b888bd..fd8714ecf 100644
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -89,6 +89,7 @@ flavors = {
     'Android': 'android',
     'Linux': 'linux',
     'Darwin': 'mac' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' else 'ios',
+    'SunOS': 'solaris',
     'GNU/kFreeBSD': 'freebsd',
     'DragonFly': 'dragonfly',
     'FreeBSD': 'freebsd',
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 7664591ad..a275957b7 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -336,6 +336,8 @@ def split_triplet(triplet):
         canonical_os = canonical_kernel = 'NetBSD'
     elif os.startswith('openbsd'):
         canonical_os = canonical_kernel = 'OpenBSD'
+    elif os.startswith('solaris'):
+        canonical_os = canonical_kernel = 'SunOS'
     else:
         die('Unknown OS: %s' % os)
 
@@ -569,6 +571,28 @@ def target_is_linux(target):
 
 set_define('XP_LINUX', target_is_linux)
 
+@depends(target)
+def target_is_solaris(target):
+    if target.kernel == 'SunOS':
+        return True
+
+set_define('XP_SOLARIS', target_is_solaris)
+
+@depends(target)
+def target_is_sparc(target):
+    if target.cpu == 'sparc':
+        return True
+
+set_define('SPARC', target_is_sparc)
+
+@depends(target)
+def target_is_sparc64(target):
+    if target.cpu == 'sparc64':
+        return True
+
+set_define('SPARC64', target_is_sparc64)
+
+
 # The application/project to build
 # ==============================================================
 option('--enable-application', nargs=1, env='MOZ_BUILD_APP',
diff --git a/build/moz.configure/memory.configure b/build/moz.configure/memory.configure
index 398413b62..1292d7273 100644
--- a/build/moz.configure/memory.configure
+++ b/build/moz.configure/memory.configure
@@ -58,6 +58,9 @@ def jemalloc_os_define(jemalloc, target):
             return 'MOZ_MEMORY_DARWIN'
         if target.kernel in ('kFreeBSD', 'FreeBSD', 'NetBSD'):
             return 'MOZ_MEMORY_BSD'
+        if target.kernel == 'SunOS':
+            return 'MOZ_MEMORY_SOLARIS'
+
         die('--enable-jemalloc is not supported on %s', target.kernel)
 
 set_define(jemalloc_os_define, '1')
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 326b2327e..65add5cdc 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -215,6 +215,7 @@ def old_configure_options(*options):
     '--enable-pref-extensions',
     '--enable-private-build',
     '--enable-pulseaudio',
+    '--enable-sndio',
     '--enable-raw',
     '--enable-readline',
     '--enable-reflow-perf',
@@ -306,6 +307,8 @@ def old_configure_options(*options):
     '--enable-mapi',
     '--enable-calendar',
     '--enable-incomplete-external-linkage',
+    '--enable-mailnews',
+    '--enable-mailnews-oauth2',
     
     # Below are configure flags used by Pale Moon
     '--disable-browser-statusbar',