diff --git a/config/CONFIG.Host.UnixCommon b/config/CONFIG.Host.UnixCommon index 892af426c..3b9febb39 100644 --- a/config/CONFIG.Host.UnixCommon +++ b/config/CONFIG.Host.UnixCommon @@ -83,7 +83,7 @@ OP_SYS_LDLIBS = -lm # Link definitions LINK.c = $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) - + #-------------------------------------------------- # Allow site overrides -include $(EPICS_BASE)/config/CONFIG_SITE.Host.UnixCommon diff --git a/config/CONFIG.Host.solaris b/config/CONFIG.Host.solaris index f5cf4d59f..56c98332b 100644 --- a/config/CONFIG.Host.solaris +++ b/config/CONFIG.Host.solaris @@ -64,7 +64,7 @@ CCC_SLIBS_NO= CCC_DEPENDS_FLAG = -xM1 CCC_SHRLIB_CFLAGS_YES = CCC_SHRLIB_LDFLAGS_YES = -G -h $@ -z ignore -z combreloc -z lazyload - + SOLARIS_VERSION = $(subst 5.,,$(shell uname -r)) ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) POSIX_CPPFLAGS_YES += -D__EXTENSIONS__ diff --git a/config/CONFIG_HOST_ARCH.UnixCommon b/config/CONFIG_HOST_ARCH.UnixCommon index a2d7e286c..d7f5812dc 100644 --- a/config/CONFIG_HOST_ARCH.UnixCommon +++ b/config/CONFIG_HOST_ARCH.UnixCommon @@ -25,5 +25,3 @@ export LD_LIBRARY_PATH := $(INSTALL_HOST_LIB):$(EPICS_BASE_HOST_LIB):$(LD_LIBRAR else export LD_LIBRARY_PATH := $(EPICS_BASE_HOST_LIB):$(LD_LIBRARY_PATH) endif - -