From 31961f482c220347c5c09c9df690e1a2fbe94334 Mon Sep 17 00:00:00 2001
From: Nino Tarantino <antonio.tarantino@nasa.gov>
Date: Thu, 5 Dec 2024 08:46:30 -0600
Subject: [PATCH 1/2] Don't override the CC and C++ environment variables

Fixes an issue where some makefiles override the user's CC and C++
environment variables.
---
 trick_sims/SIM_satellite/models/Satellite/graphics/makefile | 4 ++--
 trick_sims/SIM_wheelbot/models/Battery/test/makefile        | 4 ++--
 trick_sims/SIM_wheelbot/models/Control/test/makefile        | 4 ++--
 trick_sims/SIM_wheelbot/models/Electrical/test/makefile     | 6 +++---
 trick_sims/SIM_wheelbot/models/Guidance/test/makefile       | 4 ++--
 trick_sims/SIM_wheelbot/models/Motor/test/makefile          | 4 ++--
 trick_sims/SIM_wheelbot/models/Motor/test/test/makefile     | 4 ++--
 trick_source/data_products/Apps/ExternalPrograms/makefile   | 4 ++--
 trick_source/data_products/DPX/APPS/FXPLOT/makefile         | 4 ++--
 trick_source/data_products/DPX/APPS/GXPLOT/makefile         | 4 ++--
 trick_source/data_products/DPX/DPC/makefile                 | 4 ++--
 trick_source/data_products/DPX/DPM/makefile                 | 4 ++--
 trick_source/data_products/DPX/DPV/UTILS/makefile           | 4 ++--
 trick_source/data_products/DPX/TESTING/DPC_TEST/makefile    | 4 ++--
 trick_source/data_products/DPX/TESTING/DPM_TEST/makefile    | 4 ++--
 trick_source/data_products/DPX/TESTING/DS/makefile          | 4 ++--
 .../data_products/DPX/TESTING/DS_exercisor/makefile         | 4 ++--
 trick_source/data_products/DPX/TESTING/TCDS/makefile        | 4 ++--
 trick_source/data_products/DPX/TESTING/UDS/makefile         | 4 ++--
 trick_source/data_products/DPX/test/unit_test/makefile      | 4 ++--
 trick_source/data_products/EQParse/makefile                 | 2 +-
 trick_source/data_products/Log/makefile                     | 2 +-
 trick_source/data_products/Var/makefile                     | 2 +-
 trick_source/data_products/units/makefile                   | 4 ++--
 trick_source/sim_services/DataTypes/makefile                | 4 ++--
 trick_source/sim_services/DataTypes/testing/makefile        | 4 ++--
 .../SAIntegrator/examples/AsteroidFlyBy/makefile            | 4 ++--
 .../SAIntegrator/examples/BouncyCannonBall/makefile         | 4 ++--
 .../trick_utils/SAIntegrator/examples/CannonBall/makefile   | 4 ++--
 .../SAIntegrator/examples/DefiniteIntegral/makefile         | 4 ++--
 .../SAIntegrator/examples/DoubleIntegral/makefile           | 4 ++--
 .../SAIntegrator/examples/MassSpringDamper/makefile         | 4 ++--
 .../trick_utils/SAIntegrator/examples/Orbit/makefile        | 4 ++--
 trick_source/trick_utils/SAIntegrator/makefile              | 4 ++--
 trick_source/trick_utils/comm/test_programs/makefile        | 2 +-
 trick_source/trick_utils/units/Unittest/makefile            | 4 ++--
 trick_source/web/CivetServer/makefile                       | 4 ++--
 37 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/makefile b/trick_sims/SIM_satellite/models/Satellite/graphics/makefile
index 231700b49..d740f15d4 100644
--- a/trick_sims/SIM_satellite/models/Satellite/graphics/makefile
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/makefile
@@ -1,5 +1,5 @@
-CPP      = g++
-CC       = gcc
+CPP     ?= g++
+CC      ?= gcc
 
 ifeq ($(shell uname), Darwin)
        GL_LIBS  = -framework GLUT -framework OpenGL
diff --git a/trick_sims/SIM_wheelbot/models/Battery/test/makefile b/trick_sims/SIM_wheelbot/models/Battery/test/makefile
index 14af12b1a..02327e19c 100644
--- a/trick_sims/SIM_wheelbot/models/Battery/test/makefile
+++ b/trick_sims/SIM_wheelbot/models/Battery/test/makefile
@@ -1,8 +1,8 @@
 
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DECL_DIR = ..
 GTEST_DIR = ${HOME}/gtest-1.7.0
diff --git a/trick_sims/SIM_wheelbot/models/Control/test/makefile b/trick_sims/SIM_wheelbot/models/Control/test/makefile
index c863277a9..9a5c2bba7 100644
--- a/trick_sims/SIM_wheelbot/models/Control/test/makefile
+++ b/trick_sims/SIM_wheelbot/models/Control/test/makefile
@@ -1,6 +1,6 @@
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 PROJECT_DIR = ../..
 
diff --git a/trick_sims/SIM_wheelbot/models/Electrical/test/makefile b/trick_sims/SIM_wheelbot/models/Electrical/test/makefile
index 6feffff61..2f4a2c0f3 100644
--- a/trick_sims/SIM_wheelbot/models/Electrical/test/makefile
+++ b/trick_sims/SIM_wheelbot/models/Electrical/test/makefile
@@ -1,6 +1,6 @@
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DECL_DIR = ..
 GTEST_DIR = ${HOME}/gtest-1.7.0
@@ -38,4 +38,4 @@ ElectricalCircuitTest.o : ElectricalCircuitTest.cpp
 
 ElectricalCircuitTest : ElectricalCircuitTest.o gtest_main.o gtest-all.o
 	$(CPP) $(CFLAGS) -o $@ $^ $(LIBS)
-	
\ No newline at end of file
+	
diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/makefile b/trick_sims/SIM_wheelbot/models/Guidance/test/makefile
index 8372803be..ef9af3b34 100644
--- a/trick_sims/SIM_wheelbot/models/Guidance/test/makefile
+++ b/trick_sims/SIM_wheelbot/models/Guidance/test/makefile
@@ -1,8 +1,8 @@
 
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DECL_DIR = ..
 GTEST_DIR = ${HOME}/gtest-1.7.0
diff --git a/trick_sims/SIM_wheelbot/models/Motor/test/makefile b/trick_sims/SIM_wheelbot/models/Motor/test/makefile
index 54e635385..75df75583 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/test/makefile
+++ b/trick_sims/SIM_wheelbot/models/Motor/test/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DECL_DIR = ..
 GTEST_DIR = ${HOME}/gtest-1.7.0
diff --git a/trick_sims/SIM_wheelbot/models/Motor/test/test/makefile b/trick_sims/SIM_wheelbot/models/Motor/test/test/makefile
index c863277a9..9a5c2bba7 100644
--- a/trick_sims/SIM_wheelbot/models/Motor/test/test/makefile
+++ b/trick_sims/SIM_wheelbot/models/Motor/test/test/makefile
@@ -1,6 +1,6 @@
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 PROJECT_DIR = ../..
 
diff --git a/trick_source/data_products/Apps/ExternalPrograms/makefile b/trick_source/data_products/Apps/ExternalPrograms/makefile
index a56fabd45..a86e07f08 100644
--- a/trick_source/data_products/Apps/ExternalPrograms/makefile
+++ b/trick_source/data_products/Apps/ExternalPrograms/makefile
@@ -1,4 +1,4 @@
-CC            = gcc 
+CC           ?= gcc
 
 ifndef TRICK_HOST_CPU
 TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU)
@@ -34,7 +34,7 @@ TRICK_CFLAGS += -Wall
 endif
 
 ifeq ($(TRICK_HOST_TYPE),Darwin)
-CC = cc
+CC ?= cc
 LD_SHARED = $(CC) -bundle
 TRICK_CFLAGS += -Wall
 endif
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/makefile b/trick_source/data_products/DPX/APPS/FXPLOT/makefile
index b3bb90b1f..bac734a48 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/makefile
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/makefile
@@ -2,8 +2,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DPX_DIR = ../..
 
diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/makefile b/trick_source/data_products/DPX/APPS/GXPLOT/makefile
index e23337c54..4c299855d 100644
--- a/trick_source/data_products/DPX/APPS/GXPLOT/makefile
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/makefile
@@ -2,8 +2,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DPX_DIR = ../..
 
diff --git a/trick_source/data_products/DPX/DPC/makefile b/trick_source/data_products/DPX/DPC/makefile
index 24e34a72a..683137124 100644
--- a/trick_source/data_products/DPX/DPC/makefile
+++ b/trick_source/data_products/DPX/DPC/makefile
@@ -2,8 +2,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DPX_DIR  = ..
 
diff --git a/trick_source/data_products/DPX/DPM/makefile b/trick_source/data_products/DPX/DPM/makefile
index 2b67ccd1b..928d9a7d2 100644
--- a/trick_source/data_products/DPX/DPM/makefile
+++ b/trick_source/data_products/DPX/DPM/makefile
@@ -2,8 +2,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DPX_DIR = ..
 
diff --git a/trick_source/data_products/DPX/DPV/UTILS/makefile b/trick_source/data_products/DPX/DPV/UTILS/makefile
index 58ff07342..a66a1395a 100644
--- a/trick_source/data_products/DPX/DPV/UTILS/makefile
+++ b/trick_source/data_products/DPX/DPV/UTILS/makefile
@@ -2,8 +2,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP ?= g++
 
 DPX_DIR  = ../..
 
diff --git a/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile b/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile
index d784228f1..dc9a4e903 100644
--- a/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile
+++ b/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile
@@ -11,8 +11,8 @@ endif
 
 SHELL = /bin/sh
 RM = rm -rf
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP ?= g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile b/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile
index 1bae65f09..9b6898280 100644
--- a/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile
+++ b/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile
@@ -3,8 +3,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 SHELL = /bin/sh
 RM = rm -rf
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP ?= g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/DS/makefile b/trick_source/data_products/DPX/TESTING/DS/makefile
index 399e0aac2..719fd50b1 100644
--- a/trick_source/data_products/DPX/TESTING/DS/makefile
+++ b/trick_source/data_products/DPX/TESTING/DS/makefile
@@ -11,8 +11,8 @@ endif
 
 SHELL = /bin/sh
 RM = rm -rf
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP ?= g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile b/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile
index 9c9e9be62..5fce401a9 100644
--- a/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile
+++ b/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile
@@ -3,8 +3,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 SHELL = /bin/sh
 RM = rm -rf
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP ?= g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/TCDS/makefile b/trick_source/data_products/DPX/TESTING/TCDS/makefile
index cc7677368..176ae582a 100644
--- a/trick_source/data_products/DPX/TESTING/TCDS/makefile
+++ b/trick_source/data_products/DPX/TESTING/TCDS/makefile
@@ -11,8 +11,8 @@ endif
 
 SHELL = /bin/sh
 RM = rm -rf
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP ?= g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/UDS/makefile b/trick_source/data_products/DPX/TESTING/UDS/makefile
index c3144d8c3..cd3225ad5 100644
--- a/trick_source/data_products/DPX/TESTING/UDS/makefile
+++ b/trick_source/data_products/DPX/TESTING/UDS/makefile
@@ -11,8 +11,8 @@ endif
 
 SHELL = /bin/sh
 RM = rm -rf
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP ?= g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/test/unit_test/makefile b/trick_source/data_products/DPX/test/unit_test/makefile
index 472b154ed..2b087ea01 100644
--- a/trick_source/data_products/DPX/test/unit_test/makefile
+++ b/trick_source/data_products/DPX/test/unit_test/makefile
@@ -2,8 +2,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP ?= g++
 
 DPX_DIR = ${TRICK_HOME}/trick_source/data_products/DPX
 DS_DIR  = ${TRICK_HOME}/trick_source/data_products
diff --git a/trick_source/data_products/EQParse/makefile b/trick_source/data_products/EQParse/makefile
index 6a5cc3bd3..b38119287 100644
--- a/trick_source/data_products/EQParse/makefile
+++ b/trick_source/data_products/EQParse/makefile
@@ -1,7 +1,7 @@
 
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
-CC        = cc
+CC       ?= cc
 
 OBJ_DIR    = object_${TRICK_HOST_CPU}
 LIBDIR    = ../lib_${TRICK_HOST_CPU}
diff --git a/trick_source/data_products/Log/makefile b/trick_source/data_products/Log/makefile
index f4a209a29..80ef052ff 100644
--- a/trick_source/data_products/Log/makefile
+++ b/trick_source/data_products/Log/makefile
@@ -1,7 +1,7 @@
 
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
-CC        = c++
+CC       ?= c++
 
 ifndef TRICK_HOST_CPU
 TRICK_HOST_CPU := $(shell uname -s)
diff --git a/trick_source/data_products/Var/makefile b/trick_source/data_products/Var/makefile
index 44eb5a0e1..c64f0206a 100644
--- a/trick_source/data_products/Var/makefile
+++ b/trick_source/data_products/Var/makefile
@@ -1,7 +1,7 @@
 
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
-CC        = c++ 
+CC       ?= c++
 
 ifndef TRICK_HOST_CPU
 TRICK_HOST_CPU := $(shell uname -s)
diff --git a/trick_source/data_products/units/makefile b/trick_source/data_products/units/makefile
index 20f28d6ca..cc58921d7 100644
--- a/trick_source/data_products/units/makefile
+++ b/trick_source/data_products/units/makefile
@@ -1,8 +1,8 @@
 
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
-CC  = cc
-CPP = c++
+CC  ?= cc
+CPP ?= c++
 
 ifndef TRICK_HOST_CPU
 TRICK_HOST_CPU := $(shell uname -s)
diff --git a/trick_source/sim_services/DataTypes/makefile b/trick_source/sim_services/DataTypes/makefile
index b5050c78f..c240c9cf2 100644
--- a/trick_source/sim_services/DataTypes/makefile
+++ b/trick_source/sim_services/DataTypes/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 
 CFLAGS = -g -Wall
diff --git a/trick_source/sim_services/DataTypes/testing/makefile b/trick_source/sim_services/DataTypes/testing/makefile
index ec78b03c0..f6e27dbc0 100644
--- a/trick_source/sim_services/DataTypes/testing/makefile
+++ b/trick_source/sim_services/DataTypes/testing/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 DECL_DIR = ..
 
diff --git a/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile b/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile
index 0e628f449..e436645d9 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile
+++ b/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 CXXFLAGS = -g -Wall
 INCLUDE_DIRS = -I../../include
diff --git a/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile b/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile
index 8c14f0b09..d0f29f28f 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile
+++ b/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 CXXFLAGS = -g -Wall
 INCLUDE_DIRS = -I../../include
diff --git a/trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile b/trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile
index 3bf6eb8d1..05daf637d 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile
+++ b/trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 CXXFLAGS = -g -Wall
 INCLUDE_DIRS = -I../../include
diff --git a/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile b/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile
index c136ed780..6e19d246d 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile
+++ b/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 CXXFLAGS = -g -Wall
 INCLUDE_DIRS = -I../../include
diff --git a/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile b/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile
index 835703aae..f111ac6e4 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile
+++ b/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 CXXFLAGS = -g -Wall
 INCLUDE_DIRS = -I../../include
diff --git a/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile b/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile
index bda3abb51..b41d4f8a6 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile
+++ b/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 CXXFLAGS = -g -Wall
 INCLUDE_DIRS = -I../../include
diff --git a/trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile b/trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile
index 5d155c261..e16bc20a3 100644
--- a/trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile
+++ b/trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 CXXFLAGS = -g -Wall
 INCLUDE_DIRS = -I../../include
diff --git a/trick_source/trick_utils/SAIntegrator/makefile b/trick_source/trick_utils/SAIntegrator/makefile
index cdd6eaeb9..2a7ed210f 100644
--- a/trick_source/trick_utils/SAIntegrator/makefile
+++ b/trick_source/trick_utils/SAIntegrator/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 
 CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}
 INCLUDE_DIRS = -Iinclude
diff --git a/trick_source/trick_utils/comm/test_programs/makefile b/trick_source/trick_utils/comm/test_programs/makefile
index f1739a412..1328f3891 100644
--- a/trick_source/trick_utils/comm/test_programs/makefile
+++ b/trick_source/trick_utils/comm/test_programs/makefile
@@ -20,7 +20,7 @@ TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
 endif
 
 
-CC = cc 
+CC ?= cc
 FLAGS =
 ifeq ($(TRICK_HOST_TYPE), Darwin)
  LIBS =
diff --git a/trick_source/trick_utils/units/Unittest/makefile b/trick_source/trick_utils/units/Unittest/makefile
index a29f43eae..45dda6f07 100644
--- a/trick_source/trick_utils/units/Unittest/makefile
+++ b/trick_source/trick_utils/units/Unittest/makefile
@@ -9,8 +9,8 @@ TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE)
 endif
 
 
-CC  = gcc
-CPP = g++
+CC  ?= gcc
+CPP ?= g++
 
 CFLAGS = -g -Wall -I../include 
 
diff --git a/trick_source/web/CivetServer/makefile b/trick_source/web/CivetServer/makefile
index fce4065f4..3ecd1271a 100644
--- a/trick_source/web/CivetServer/makefile
+++ b/trick_source/web/CivetServer/makefile
@@ -1,8 +1,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
-CPP = c++
+CC ?= cc
+CPP ?= c++
 CURL = curl
 MV = mv
 CP = cp

From c9e76d4714b7990ac3b6b1430f860171c77ec3bf Mon Sep 17 00:00:00 2001
From: Nino Tarantino <antonio.tarantino@nasa.gov>
Date: Wed, 11 Dec 2024 13:52:30 -0600
Subject: [PATCH 2/2] Restore test makefiles

---
 trick_source/data_products/DPX/TESTING/DPC_TEST/makefile     | 4 ++--
 trick_source/data_products/DPX/TESTING/DPM_TEST/makefile     | 4 ++--
 trick_source/data_products/DPX/TESTING/DS/makefile           | 4 ++--
 trick_source/data_products/DPX/TESTING/DS_exercisor/makefile | 4 ++--
 trick_source/data_products/DPX/TESTING/TCDS/makefile         | 4 ++--
 trick_source/data_products/DPX/TESTING/UDS/makefile          | 4 ++--
 trick_source/data_products/DPX/test/unit_test/makefile       | 4 ++--
 trick_source/sim_services/DataTypes/testing/makefile         | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile b/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile
index dc9a4e903..d784228f1 100644
--- a/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile
+++ b/trick_source/data_products/DPX/TESTING/DPC_TEST/makefile
@@ -11,8 +11,8 @@ endif
 
 SHELL = /bin/sh
 RM = rm -rf
-CC ?= gcc
-CPP ?= g++
+CC = gcc
+CPP = g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile b/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile
index 9b6898280..1bae65f09 100644
--- a/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile
+++ b/trick_source/data_products/DPX/TESTING/DPM_TEST/makefile
@@ -3,8 +3,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 SHELL = /bin/sh
 RM = rm -rf
-CC ?= gcc
-CPP ?= g++
+CC = gcc
+CPP = g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/DS/makefile b/trick_source/data_products/DPX/TESTING/DS/makefile
index 719fd50b1..399e0aac2 100644
--- a/trick_source/data_products/DPX/TESTING/DS/makefile
+++ b/trick_source/data_products/DPX/TESTING/DS/makefile
@@ -11,8 +11,8 @@ endif
 
 SHELL = /bin/sh
 RM = rm -rf
-CC ?= gcc
-CPP ?= g++
+CC = gcc
+CPP = g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile b/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile
index 5fce401a9..9c9e9be62 100644
--- a/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile
+++ b/trick_source/data_products/DPX/TESTING/DS_exercisor/makefile
@@ -3,8 +3,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 SHELL = /bin/sh
 RM = rm -rf
-CC ?= gcc
-CPP ?= g++
+CC = gcc
+CPP = g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/TCDS/makefile b/trick_source/data_products/DPX/TESTING/TCDS/makefile
index 176ae582a..cc7677368 100644
--- a/trick_source/data_products/DPX/TESTING/TCDS/makefile
+++ b/trick_source/data_products/DPX/TESTING/TCDS/makefile
@@ -11,8 +11,8 @@ endif
 
 SHELL = /bin/sh
 RM = rm -rf
-CC ?= gcc
-CPP ?= g++
+CC = gcc
+CPP = g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/TESTING/UDS/makefile b/trick_source/data_products/DPX/TESTING/UDS/makefile
index cd3225ad5..c3144d8c3 100644
--- a/trick_source/data_products/DPX/TESTING/UDS/makefile
+++ b/trick_source/data_products/DPX/TESTING/UDS/makefile
@@ -11,8 +11,8 @@ endif
 
 SHELL = /bin/sh
 RM = rm -rf
-CC ?= gcc
-CPP ?= g++
+CC = gcc
+CPP = g++
 PWD = $(shell pwd)
 DEV_NULL = > /dev/null 2>&1
 GCC = $(shell which gcc)
diff --git a/trick_source/data_products/DPX/test/unit_test/makefile b/trick_source/data_products/DPX/test/unit_test/makefile
index 2b087ea01..472b154ed 100644
--- a/trick_source/data_products/DPX/test/unit_test/makefile
+++ b/trick_source/data_products/DPX/test/unit_test/makefile
@@ -2,8 +2,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC ?= gcc
-CPP ?= g++
+CC = gcc
+CPP = g++
 
 DPX_DIR = ${TRICK_HOME}/trick_source/data_products/DPX
 DS_DIR  = ${TRICK_HOME}/trick_source/data_products
diff --git a/trick_source/sim_services/DataTypes/testing/makefile b/trick_source/sim_services/DataTypes/testing/makefile
index f6e27dbc0..ec78b03c0 100644
--- a/trick_source/sim_services/DataTypes/testing/makefile
+++ b/trick_source/sim_services/DataTypes/testing/makefile
@@ -1,7 +1,7 @@
 
 RM = rm -rf
-CC ?= cc
-CPP ?= c++
+CC = cc
+CPP = c++
 
 DECL_DIR = ..