From 8c2214b14d7b4e4d7c5097c66ddfcdda18aac67f Mon Sep 17 00:00:00 2001
From: Ezekiel Dohmen <ezekiel.dohmen@ligo.org>
Date: Fri, 27 May 2022 10:53:41 -0700
Subject: [PATCH] Adding logic to undef IOP_MODEL before we include the env
 that may define it, that way the ENV can't be setting it

---
 src/epics/util/Makefile.kernel | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/epics/util/Makefile.kernel b/src/epics/util/Makefile.kernel
index 121633eac..a949ab6b3 100644
--- a/src/epics/util/Makefile.kernel
+++ b/src/epics/util/Makefile.kernel
@@ -17,6 +17,12 @@ $(shell cp -rp $(RCG_SRC)/src/fe/ $(mkfile_dir)/src/)
 $(shell cp -rp $(RCG_SRC)/src/drv/ $(mkfile_dir)/src/)
 $(shell cp -rp $(RCG_SRC)/src/shmem/ $(mkfile_dir)/src/)
 
+# We always want to take these values from the below 
+# KernelVars.mk script and not the ENV
+undefine IOP_MODEL
+undefine BUILD_WITH_DOLPHIN
+
+
 # Include the generated make variables, written by
 # the feCodeGen.pl script.
 include $(mkfile_dir)/KernelVars.mk
-- 
GitLab