Don't override the CC and C++ environment variables

Fixes an issue where some makefiles override the user's CC and C++ environment variables.
nasa · Dec 6, 2024 · 31961f4 · 31961f4
1 parent f9d9d6e
commit 31961f4
Show file tree

Hide file tree

Showing 37 changed files with 71 additions and 71 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)
-
+
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 =
@@ Expand Down @@