From a3732082af53c5dfae727578799fe42c0e3d3cc8 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 15 Sep 2005 16:07:53 +0000 Subject: [PATCH] Moved common code into new file CONFIG.solarisCommon.solarisCommon. --- .../os/CONFIG.solaris-sparc.solaris-sparc | 57 +--------------- configure/os/CONFIG.solaris-x86.solaris-x86 | 52 +------------- .../os/CONFIG.solarisCommon.solarisCommon | 67 +++++++++++++++++++ 3 files changed, 69 insertions(+), 107 deletions(-) create mode 100644 configure/os/CONFIG.solarisCommon.solarisCommon diff --git a/configure/os/CONFIG.solaris-sparc.solaris-sparc b/configure/os/CONFIG.solaris-sparc.solaris-sparc index add7388b6..50a024158 100644 --- a/configure/os/CONFIG.solaris-sparc.solaris-sparc +++ b/configure/os/CONFIG.solaris-sparc.solaris-sparc @@ -7,59 +7,4 @@ # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc #------------------------------------------------------- -SPARCWORKS = /opt/SUNWspro - -CC = $(SPARCWORKS)/bin/cc -CCC = $(SPARCWORKS)/bin/CC -CPP = $(CC) -E -Qn -RANLIB = -# required by sun's C++ compiler -AR = $(CCC) -xar -o -LD = ld -r - -#Prepare the object code for profiling with prof. (YES or NO) -PROFILE=NO -#Prepare the object code for profiling with gprof. (YES or NO) -GPROF=NO - -# Configure OS vendor C compiler -CONFORM_CFLAGS_ANSI = -Xa -v -CONFORM_CFLAGS_STRICT = -Xc -v -CONFORM_CFLAGS_TRAD = -Xs -PROF_CFLAGS_YES = -p -GPROF_CFLAGS_YES = -xpg -CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF)) -WARN_CFLAGS_YES = -WARN_CFLAGS_NO = -w -OPT_CFLAGS_YES = -xO4 -OPT_CFLAGS_NO = -g - -# Configure OS vendor C++ compiler -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = -PROF_CXXFLAGS_YES = -p -GPROF_CXXFLAGS_YES = -xpg -CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF)) -WARN_CXXFLAGS_YES = +w -WARN_CXXFLAGS_NO = -OPT_CXXFLAGS_YES = -O -OPT_CXXFLAGS_NO = -g - -CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF)) - -STATIC_LDFLAGS_YES= -Bstatic -STATIC_LDFLAGS_NO= -STATIC_LDLIBS_YES= -Bdynamic -STATIC_LDLIBS_NO= - -SHRLIB_CFLAGS = -KPIC -SHRLIB_LDFLAGS += -z defs -G -h $@ -z text -LOADABLE_SHRLIB_LDFLAGS += -G -h $@ -z text - -OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload - -# Filter for getting rid of "invalid white space character in directive" compiler warnings -# when including headers created during win32 build. -#COMPILE_FILTER.c = 2>&1 | $(EPICS_BASE)/configure/tools/filterWarnings.pl -#COMPILE_FILTER.cpp = $(COMPILE_FILTER.c) - +include $(CONFIG)/os/CONFIG.solarisCommon.solarisCommon diff --git a/configure/os/CONFIG.solaris-x86.solaris-x86 b/configure/os/CONFIG.solaris-x86.solaris-x86 index b35f0789e..edc3f0daf 100644 --- a/configure/os/CONFIG.solaris-x86.solaris-x86 +++ b/configure/os/CONFIG.solaris-x86.solaris-x86 @@ -7,54 +7,4 @@ # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86 #------------------------------------------------------- -SPARCWORKS = /opt/SUNWspro - -CC = $(SPARCWORKS)/bin/cc -CCC = $(SPARCWORKS)/bin/CC -CPP = $(CC) -E -Qn -RANLIB = -# required by sun's C++ compiler -AR = $(CCC) -xar -o -LD = ld -r - -#Prepare the object code for profiling with prof. (YES or NO) -PROFILE=NO -#Prepare the object code for profiling with gprof. (YES or NO) -GPROF=NO - -# Configure OS vendor C compiler -CONFORM_CFLAGS_ANSI = -Xa -v -CONFORM_CFLAGS_STRICT = -Xc -v -CONFORM_CFLAGS_TRAD = -Xs -PROF_CFLAGS_YES = -p -GPROF_CFLAGS_YES = -xpg -CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF)) -WARN_CFLAGS_YES = -WARN_CFLAGS_NO = -w -OPT_CFLAGS_YES = -xO4 -OPT_CFLAGS_NO = -g - -# Configure OS vendor C++ compiler -CONFORM_CXXFLAGS_NORMAL = -CONFORM_CXXFLAGS_STRICT = -PROF_CXXFLAGS_YES = -p -GPROF_CXXFLAGS_YES = -xpg -CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF)) -WARN_CXXFLAGS_YES = +w -WARN_CXXFLAGS_NO = -OPT_CXXFLAGS_YES = -O -OPT_CXXFLAGS_NO = -g - -CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF)) - -STATIC_LDFLAGS_YES= -Bstatic -STATIC_LDFLAGS_NO= -STATIC_LDLIBS_YES= -Bdynamic -STATIC_LDLIBS_NO= - -SHRLIB_CFLAGS = -KPIC -SHRLIB_LDFLAGS += -z defs -G -h $@ -z text -LOADABLE_SHRLIB_LDFLAGS += -G -h $@ -z text - -OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload - +include $(CONFIG)/os/CONFIG.solarisCommon.solarisCommon diff --git a/configure/os/CONFIG.solarisCommon.solarisCommon b/configure/os/CONFIG.solarisCommon.solarisCommon new file mode 100644 index 000000000..c577cd7df --- /dev/null +++ b/configure/os/CONFIG.solarisCommon.solarisCommon @@ -0,0 +1,67 @@ +# CONFIG.solaris-sparc.solaris-sparc +# +# $Id$ +# This file is maintained by the build community. +# +# Definitions for solaris-sparc host - solaris-sparc target build +# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc +#------------------------------------------------------- + +SPARCWORKS = /opt/SUNWspro + +CC = $(SPARCWORKS)/bin/cc +CCC = $(SPARCWORKS)/bin/CC +CPP = $(CC) -E -Qn +RANLIB = +# required by sun's C++ compiler +AR = $(CCC) -xar -o +LD = ld -r + +#Prepare the object code for profiling with prof. (YES or NO) +PROFILE=NO +#Prepare the object code for profiling with gprof. (YES or NO) +GPROF=NO + +# Configure OS vendor C compiler +CONFORM_CFLAGS_ANSI = -Xa -v +CONFORM_CFLAGS_STRICT = -Xc -v +CONFORM_CFLAGS_TRAD = -Xs +PROF_CFLAGS_YES = -p +GPROF_CFLAGS_YES = -xpg +CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF)) +WARN_CFLAGS_YES = +WARN_CFLAGS_NO = -w +OPT_CFLAGS_YES = -xO4 +OPT_CFLAGS_NO = -g + +# Configure OS vendor C++ compiler +CONFORM_CXXFLAGS_NORMAL = +CONFORM_CXXFLAGS_STRICT = +PROF_CXXFLAGS_YES = -p +GPROF_CXXFLAGS_YES = -xpg +CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF)) +WARN_CXXFLAGS_YES = +w +WARN_CXXFLAGS_NO = +OPT_CXXFLAGS_YES = -O +OPT_CXXFLAGS_NO = -g + +CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF)) + +STRIP_LDFLAGS_YES = -s + +STATIC_LDFLAGS_YES= -Bstatic +STATIC_LDFLAGS_NO= +STATIC_LDLIBS_YES= -Bdynamic +STATIC_LDLIBS_NO= + +SHRLIB_CFLAGS = -KPIC +SHRLIB_LDFLAGS = -z defs -G -h $@ -z text +LOADABLE_SHRLIB_LDFLAGS = -G -h $@ -z text + +OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload + +# Filter for getting rid of "invalid white space character in directive" compiler warnings +# when including headers created during win32 build. +#COMPILE_FILTER.c = 2>&1 | $(EPICS_BASE)/configure/tools/filterWarnings.pl +#COMPILE_FILTER.cpp = $(COMPILE_FILTER.c) +