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

Fix up definition of CONFORM_CXXFLAGS.

Browse Source 
Move definition of command-line library OP_SYS_LDLIBS so that the value
isn't destroyed.
This commit is contained in:
W. Eric Norum
2002-11-29 14:53:21 +00:00
parent 384e3af4b5
commit 8d75c8baed
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure/CONFIG_COMMON
View File

@@ -164,11 +164,6 @@ LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
PROD_BAF = $(addsuffix $(BAF), $(basename $(PROD)))
LIB_BAF=$(addsuffix $(BAF),$(basename $(LIBRARY)))
#--------------------------------------------------
# Command-line input support default
COMMANDLINE_LIBRARY = EPICS
OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
#--------------------------------------------------
# C preprocessor, compiler, and linker flag defaults
@@ -217,7 +212,7 @@ TARGET_CPPFLAGS += $($(basename $@)_CPPFLAGS_$(OS_CLASS)) $($(basename $@)_CPPFL
# Level of ansi conformance flags
CONFORM_CPPFLAGS = $(CONFORM_CPPFLAGS_$(CMPLR))
CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(CMPLR))
CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_CMPLR))
CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CMPLR))
# Warnings flags
WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN))
@@ -238,6 +233,11 @@ STATIC_CXXCFLAGS = $(STATIC_CXXFLAGS_$(STATIC_BUILD))
STATIC_LDFLAGS = $(STATIC_LDFLAGS_$(STATIC_BUILD))
STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
#--------------------------------------------------
# Command-line input support default
COMMANDLINE_LIBRARY = EPICS
OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
#--------------------------------------------------
# Flags