From 4013ea544b59ff967e72ddf52dd4386e2f8dc918 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Sat, 2 Nov 1996 00:29:02 +0000
Subject: [PATCH] os depen -I and $(CCC) -xar for ar

---
 config/CONFIG.sun4 | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/config/CONFIG.sun4 b/config/CONFIG.sun4
index d0e6d7c74..4523774cc 100644
--- a/config/CONFIG.sun4
+++ b/config/CONFIG.sun4
@@ -13,8 +13,6 @@ BUILD_TYPE = Unix
 GCC = gcc 
 ACC = /usr/lang/acc
 SUNCC = cc
-AR = ar
-ARFLAGS = r
 RANLIB = ranlib
 RANLIBFLAGS = -t
 YACC = $(EYACC)
@@ -25,6 +23,21 @@ MV = mv
 RMDIR = rm -rf
 MKDIR = mkdir
 
+#
+# original before use of sun C++
+#
+#ARFLAGS = r
+#AR = ar
+
+#
+# required by sun's C++ compiler
+#
+ARFLAGS = 
+_ARCHIVE_BUILDER = ar r 
+G++_ARCHIVE_BUILDER = $(_ARCHIVE_BUILDER) 
+CCC_ARCHIVE_BUILDER = $(CCC) -xar -o 
+AR = $($(CPLUSPLUS)_ARCHIVE_BUILDER)
+
 ACC_ANSI_INVOKE_W_NO = $(ACC) -Xa -w
 ACC_ANSI_INVOKE_W_YES = $(ACC) -Xa
 ACC_TRAD_INVOKE_W_NO = $(ACC) -Xs -w
@@ -96,7 +109,7 @@ OPTIM_NO =
 UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT))
 
 # Include files
-UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE)
+UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(T_A)
  
 # Operating system flags
 OP_SYS_FLAGS = -DUNIX