epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Unix build now always uses SHRLIB_CFLAGS when compiling library src files.

Browse Source 
Added ARCH_CLASS facility for USR_CPPFLAGS.
This commit is contained in:
Janet B. Anderson
1998-11-09 21:39:47 +00:00
parent 7a7bd7a6b9
commit 7977848096
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/CONFIG.Host.UnixCommon
-1
View File
@@ -19,7 +19,6 @@ LIBNAME = $(LIBRARY:%=lib%.a)
SHRLIB_SUFFIX = .so
SHRLIBNAME = lib$(LIBRARY)$(SHRLIB_SUFFIX)$(SHRLIB_VERSION:%=.%)
SHRLIB_CFLAGS = $($(ANSI)_SHRLIB_CFLAGS_$(strip $(SHARED_LIBRARIES)))
SHRLIB_LDFLAGS = $($(ANSI)_SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES)))
DLL_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)
config/RULES.Host
+10 -2
View File
@@ -88,6 +88,14 @@ USR_CXXFLAGS+=$(USR_CXXFLAGS_DEFAULT)
endif
endif
ifneq ($(strip $(USR_CPPFLAGS_$(ARCH_CLASS))),)
USR_CPPFLAGS+=$(subst -nil-,,$(USR_CPPFLAGS_$(ARCH_CLASS)))
else
ifdef USR_CPPFLAGS_DEFAULT
USR_CPPFLAGS+=$(USR_CPPFLAGS_DEFAULT)
endif
endif
ifneq ($(strip $(USR_LDFLAGS_$(ARCH_CLASS))),)
USR_LDFLAGS+=$(subst -nil-,,$(USR_LDFLAGS_$(ARCH_CLASS)))
else
@@ -303,13 +311,13 @@ endif # EPICS_BASE
ifdef LIBRARY
ifdef LIBOBJS
LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS)
CFLAGS += $($(ANSI)_SHRLIB_CFLAGS_YES)
CXXFLAGS += $($(ANSI)_SHRLIB_CFLAGS_YES)
# check if shared libraries requested
ifeq ($(strip $(SHARED_LIBRARIES)),YES)
PROD_VERSION =$(SHRLIB_VERSION)
CFLAGS += $(SHRLIB_CFLAGS)
CXXFLAGS += $(SHRLIB_CFLAGS)
ifeq ($(findstring cc,$(suffix $(LIBSRCS))),cc)
SHRLIB_LINKER = $(CXX)
else