1811 dont override users cc and cpp env for data products (#1819)

* Don't override the CC and C++ environment variables Fixes an issue where some makefiles override the user's CC and C++ environment variables. * Restore test makefiles * Test to change from CC = cc to CC = gcc for only needed files. * Restore the whitespaces to their original state before the update in order to show the necessary file changes for the PR. --------- Co-authored-by: Nino Tarantino <[email protected]>
nasa · Jan 7, 2025 · 0695391 · 0695391
1 parent 80063bf
commit 0695391
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/makefile b/trick_source/data_products/DPX/APPS/FXPLOT/makefile
@@ -2,7 +2,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
+CC = gcc
 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,7 +2,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++
 
 DPX_DIR = ../..

diff --git a/trick_source/data_products/DPX/DPC/makefile b/trick_source/data_products/DPX/DPC/makefile
@@ -2,7 +2,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++
 
 DPX_DIR  = ..

diff --git a/trick_source/data_products/DPX/DPM/makefile b/trick_source/data_products/DPX/DPM/makefile
@@ -2,7 +2,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++
 
 DPX_DIR = ..

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        = gcc
 
 OBJ_DIR    = object_${TRICK_HOST_CPU}
 LIBDIR    = ../lib_${TRICK_HOST_CPU}

diff --git a/trick_source/data_products/units/makefile b/trick_source/data_products/units/makefile
@@ -1,7 +1,7 @@
 
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
-CC  = cc
+CC  = gcc
 CPP = c++
 
 ifndef TRICK_HOST_CPU

diff --git a/trick_source/sim_services/DataTypes/makefile b/trick_source/sim_services/DataTypes/makefile
@@ -1,6 +1,6 @@
 
 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++
 
 

diff --git a/trick_source/trick_utils/SAIntegrator/makefile b/trick_source/trick_utils/SAIntegrator/makefile
@@ -1,6 +1,6 @@
 
 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++
 
 CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}

diff --git a/trick_source/web/CivetServer/makefile b/trick_source/web/CivetServer/makefile
@@ -1,7 +1,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++
 CURL = curl
 MV = mv