From cba0917de28e326a2de3d3ff4aba65fca225e7f1 Mon Sep 17 00:00:00 2001
From: Caleb Herpin <caleb.herpin@gmail.com>
Date: Sun, 1 Aug 2021 10:59:34 -0500
Subject: [PATCH] Edited 32 bit make target

---
 Makefile                              | 7 +++++++
 share/trick/makefiles/Makefile.common | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index d39ff026..ba499216 100644
--- a/Makefile
+++ b/Makefile
@@ -242,6 +242,13 @@ ${TRICK_HOME}/include/civet/civetweb.h: ${CIVET_CLONE_DIR} ${TRICK_HOME}/include
 ${TRICK_HOME}/include/civet/CivetServer.h: ${CIVET_CLONE_DIR} ${TRICK_HOME}/include/civet
 	cp ${CIVET_CLONE_DIR}/include/CivetServer.h ${TRICK_HOME}/include/civet/CivetServer.h	
 
+
+ifeq (${TRICK_FORCE_32BIT},1)
+CIVET_COMPILE_FAGS=-m32
+else
+CIVET_COMPILE_FAGS=-m32
+endif
+
 ${CIVET_CLONE_DIR}/libcivetweb.a: ${CIVET_CLONE_DIR}
 	$(MAKE) -C ${CIVET_CLONE_DIR} lib COPT=${CIVET_COMPILE_FAGS} WITH_CPP=1 WITH_WEBSOCKET=1
 
diff --git a/share/trick/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common
index c960cc5c..f8c72a41 100644
--- a/share/trick/makefiles/Makefile.common
+++ b/share/trick/makefiles/Makefile.common
@@ -172,17 +172,12 @@ ifneq ($(GSL_HOME),)
 endif
 
 TRICK_CIVET=0
-CIVET_COMPILE_FAGS=
 ifneq (${TRICK_MONGOOSE},1) #TODO: Make this use a civet flag instead of a mongoose flag.
     TRICK_CIVET=1
     TRICK_LIBS += ${TRICK_LIB_DIR}/libcivetweb.a ${TRICK_LIB_DIR}/libtrickCivet.a
     TRICK_SWIG_FLAGS += -DUSE_CIVET
     TRICK_SYSTEM_CXXFLAGS += -DUSE_CIVET
     TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/civet
-
-    ifeq (${TRICK_FORCE_32BIT},1)
-        CIVET_COMPILE_FAGS=-m32 #TODO Append and don't reset variable.  Currently when we do this it adds a space.
-    endif
 endif
 
 # We pipe the output of compiler through tee.  If the user wanted gcc color, make sure they get it.