From c5c8983ef7cba273b84e617aa9e15dfe476baf9b Mon Sep 17 00:00:00 2001
From: Bryan Henderson <bryanh@giraffe.netgate.net>
Date: Sat, 2 Nov 1996 09:49:57 +0000
Subject: [PATCH] Add complete setting of AROPT

---
 src/Makefile.global | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.global b/src/Makefile.global
index cb1804f03f3..b77520eb8fd 100644
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.49 1996/11/01 21:04:48 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.50 1996/11/02 09:49:57 bryanh Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -234,6 +234,16 @@ X11_LIB = -lX11 -lsocket -lnsl
 
 YFLAGS = -d
 
+##############################################################################
+#
+#  AR
+
+ifneq (,$(findstring /$(PORTNAME)/, /BSD44_derived/bsdi/sparc/))
+  AROPT = cq
+else
+  AROPT = crs
+endif
+
 ##############################################################################
 #
 # Installation. 
@@ -301,8 +311,6 @@ CC=		gcc
 INSTALL=	/usr/bin/install
 RANLIB=		/usr/bin/ranlib
 
-AROPT = cq
-
 # FreeBSD 2.1R with new Flex v2.5.2 in /usr/local
 LEX = flex
 LDADD+= -L/usr/local/lib -lfl
@@ -448,8 +456,6 @@ else
   LDADD_BE = -ldld -lcompat
 endif
 
-AROPT=		cq
-
 #
 # for postgres.user.mk
 #
@@ -680,9 +686,6 @@ MK_PORT=	sparc
 # cc won't work!
 CC=		gcc
 
-# the ar on SunOs is dumb, can't use the s option
-AROPT=          cq
-
 INSTALL=	/usr/bin/install
 RANLIB=		/usr/bin/ranlib
 
-- 
GitLab