ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-07 11:26:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trick should not modify TRICK_CFLAGS and TRICK_CXXFLAGS

Browse Source 
Jenkins not happy with me.  Jenkins has empty TRICK_CFLAGS and
TRICK_CXXFLAGS.  There was an if statement in Makefile.common that
did something different if it was empty.

refs #90
This commit is contained in:
Alex Lin 2015-07-22 16:28:25 -05:00
parent eaf83e92f6
commit cde32e6f60
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
share/trick/makefiles/Makefile.common
View File

@ -68,13 +68,10 @@ ifeq ($(MAKELEVEL),0)
export TRICK_INCLUDES := -I${TRICK_HOME}/trick_source -I${TRICK_HOME}/include -I${TRICK_HOME}/include/trick/compat
export TRICK_VERSIONS := -DTRICK_VER=$(TRICK_MAJOR) -DTRICK_MINOR=$(TRICK_MINOR)
TRICK_SYSTEM_CFLAGS = $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic
ifdef TRICK_CXXFLAGS
TRICK_SYSTEM_CXXFLAGS += $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic
else
TRICK_SYSTEM_CXXFLAGS := ${TRICK_CFLAGS}
endif
TRICK_SYSTEM_SFLAGS += -I${TRICK_HOME}/share/trick $(TRICK_INCLUDES) $(TRICK_VERSIONS)
TRICK_SYSTEM_CXXFLAGS = $(TRICK_INCLUDES) $(TRICK_VERSIONS) -fpic
TRICK_SYSTEM_SFLAGS = -I${TRICK_HOME}/share/trick $(TRICK_INCLUDES) $(TRICK_VERSIONS)
# append additional c and cxx flags defined in config_*.mk files.
TRICK_SYSTEM_CFLAGS += $(TRICK_ADDITIONAL_CFLAGS)