From ed75ee5de72bb1cd73ad13940bcf602585665b38 Mon Sep 17 00:00:00 2001
From: "kyle.yuan%sun.com" <kyle.yuan%sun.com>
Date: Tue, 12 Oct 2004 02:39:47 +0000
Subject: [PATCH] Bug 260337 (Firefox) Fail to build on solaris r=bryner,
 patch=brian.lu@sun.com

---
 browser/config/mozconfig                          | 3 ++-
 toolkit/mozapps/installer/unix/wizard/Makefile.in | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/config/mozconfig b/browser/config/mozconfig
index 4c08f1c0a054..619f7ca236cb 100644
--- a/browser/config/mozconfig
+++ b/browser/config/mozconfig
@@ -3,7 +3,8 @@
 #  . $topsrcdir/browser/config/mozconfig
 # to the top of your mozconfig file.
 
-export MOZ_PHOENIX=1
+set MOZ_PHOENIX=1
+export MOZ_PHOENIX
 mk_add_options MOZ_PHOENIX=1
 
 ac_add_options --disable-ldap
diff --git a/toolkit/mozapps/installer/unix/wizard/Makefile.in b/toolkit/mozapps/installer/unix/wizard/Makefile.in
index e7d1769f0900..e8e79f1f0ac4 100644
--- a/toolkit/mozapps/installer/unix/wizard/Makefile.in
+++ b/toolkit/mozapps/installer/unix/wizard/Makefile.in
@@ -60,6 +60,10 @@ LIBS        = \
         -lpthread \
         $(NULL)
 
+ifeq ($(OS_ARCH),SunOS)
+LIBS    += -lnsl
+endif
+
 EXTRA_DEPS = \
 	$(DIST)/lib/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \