diff --git a/config/CONFIG.Host.solaris b/config/CONFIG.Host.solaris index 055f862d1..c13cbe3a2 100644 --- a/config/CONFIG.Host.solaris +++ b/config/CONFIG.Host.solaris @@ -26,6 +26,7 @@ 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 @@ -34,13 +35,14 @@ ACC_SFLAGS_YES= -Bstatic ACC_SFLAGS_NO= ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX ACC_SLIBS_NO= -ACC_SHRLIB_CFLAGS_YES = -KPIC -D_REENTRANT +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 = @@ -52,6 +54,7 @@ CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX CCC_SLIBS_NO= CCC_DEPENDS_FLAG = -xM1 + ARCH_DEP_CFLAGS = -DSOLARIS # socket and nsl needed by libca.a ARCH_DEP_LDLIBS = -lsocket -lnsl diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON index cbae36966..394a15f4f 100644 --- a/config/CONFIG_COMMON +++ b/config/CONFIG_COMMON @@ -109,6 +109,11 @@ G++_SHRLIB_LDFLAGS_YES = -shared CC = $($(ANSI)_$(CMPLR)) +#--------------------------------------------------------------- +# Vendor compiler dependent options +VENDOR_DEP_CFLAGS = $($(ANSI)_DEP_CFLAGS) +VENDOR_DEP_CXXFLAGS = $($(CPLUSPLUS)_DEP_CFLAGS) + #-------------------------------------------------- # C++ compiler @@ -198,10 +203,11 @@ DEPENDS_RULE = -$(COMPILE.cc) $(DEPENDS_FLAG) $^ > DEPENDS INCLUDES = -I. -I.. $(USR_INCLUDES) $(TARGET_INCLUDES) $(EPICS_INCLUDES) $(OP_SYS_INCLUDES) CFLAGS = $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\ - $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(INCLUDES) + $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VENDOR_DEP_CFLAGS) $(STATIC_CFLAGS)\ + $(OP_SYS_CFLAGS) $(INCLUDES) CXXFLAGS = $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)\ - $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(STATIC_CXXCFLAGS)\ + $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(VENDOR_DEP_CXXFLAGS) $(STATIC_CXXCFLAGS)\ $(OP_SYS_CFLAGS) $(TEMPL_INST_CXXFLAG) $(INCLUDES) LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\