From b2ce98e653e854504f43b7ca2f5782da1aa2f423 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Fri, 11 Jan 2002 19:48:03 +0000
Subject: [PATCH] Added include for CONFIG.Host.solaris and removed duplicated
 defs.

---
 config/CONFIG.Host.solaris-x86 | 60 ++--------------------------------
 1 file changed, 3 insertions(+), 57 deletions(-)

diff --git a/config/CONFIG.Host.solaris-x86 b/config/CONFIG.Host.solaris-x86
index 4c55de418..3206deea7 100644
--- a/config/CONFIG.Host.solaris-x86
+++ b/config/CONFIG.Host.solaris-x86
@@ -3,64 +3,10 @@
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solaris-x86
 
-ARCH_CLASS = solaris
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
-
-#
-# required by sun's C++ compiler
-#
-AR = ar
-_AR = $(AR) $(ARFLAGS)
-G++_AR = $(_AR)
-CCC_AR = $(CCC) -xar -o
-ARCMD = $($(CPLUSPLUS)_AR) $@
-
-RANLIB =
-
-SPARCWORKS = /opt/SUNWspro
-
-# Configure OS vendor C compiler
-ACC = $(SPARCWORKS)/bin/cc
-ACC_ANSI = $(ACC) -Xa
-ACC_STRICT = $(ACC) -Xc -v
-ACC_TRAD = $(ACC) -Xs
-ACC_DEP_CFLAGS = -KPIC -D_REENTRANT 
-ACC_WARN_YES = 
-ACC_WARN_NO =  -w
-ACC_OPT_YES =  -O
-ACC_OPT_NO = -g
-ACC_SFLAGS_YES= -Bstatic
-ACC_SFLAGS_NO=
-ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
-ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES =
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
-
-# Configure OS vendor C++ compiler
-CCC = $(SPARCWORKS)/bin/CC
-CCC_NORMAL = $(CCC) +p
-CCC_STRICT = $(CCC) +p
-CCC_DEP_CFLAGS = -KPIC -D_REENTRANT 
-CCC_TEMPL_INST_FLAG =
-CCC_WARN_YES = +w
-CCC_WARN_NO = 
-CCC_OPT_YES =  -O
-CCC_OPT_NO = -g
-CCC_SFLAGS_YES= -Bstatic
-CCC_SFLAGS_NO=
-CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
-CCC_SLIBS_NO=
-CCC_DEPENDS_FLAG = -xM1
-CCC_SHRLIB_CFLAGS_YES =
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
- 
-GCC = gcc
-G++ = g++
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
 
 # Solaris on x86
 ARCH_DEP_CFLAGS = -DSOLARIS  -D_X86_
-# socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS = -lsocket -lnsl
 
+GCC = gcc
+G++ = g++