From cde32e6f6052a548c672d930dea51433f0124c94 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Wed, 22 Jul 2015 16:28:25 -0500 Subject: [PATCH] Trick should not modify TRICK_CFLAGS and TRICK_CXXFLAGS 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 --- share/trick/makefiles/Makefile.common | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/share/trick/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common index 15087b35..eae1cac1 100644 --- a/share/trick/makefiles/Makefile.common +++ b/share/trick/makefiles/Makefile.common @@ -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)