From 5c22f83be90ef48ff9ea9cce7adc3f03f3bc40bf Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <wtc%netscape.com>
Date: Thu, 9 Aug 2001 01:38:08 +0000
Subject: [PATCH] Bugzilla bug #20860: building NSS on 64-bit OS (such as
 Solaris) requires setting USE_64=1.  The patch is from cls.  r=wtc.

---
 security/manager/Makefile.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index dd5cb25a329d..2c0812c4c8d7 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -61,7 +61,9 @@ ifdef USE_N32
 # merely adds _PTH to coreconf's OBJDIR name.
 DEFAULT_GMAKE_FLAGS += USE_N32=1 USE_PTHREADS=1
 endif
-# coreconf also uses USE_64.
+ifdef HAVE_64BIT_OS
+DEFAULT_GMAKE_FLAGS += USE_64=1
+endif
 
 SUBMAKEFILES = ssl/Makefile pki/Makefile
 else
@@ -83,9 +85,11 @@ install::
 	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
 ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
 ifneq ($(OS_TEST),i86pc)
+ifndef HAVE_64BIT_OS
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
 endif
+endif
 endif
 	$(MAKE) -C ssl $@
 	$(MAKE) -C pki $@