ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-10 15:02:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 <antonio.tarantino@nasa.gov>
This commit is contained in:
Hong Chen 2025-01-07 10:42:56 -06:00 committed by GitHub
parent 80063bf498
commit 0695391bac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_source/data_products/DPX/APPS/FXPLOT/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf RM = rm -rf
CC = cc CC = gcc
CPP = c++ CPP = c++
DPX_DIR = ../.. DPX_DIR = ../..

2
trick_source/data_products/DPX/APPS/GXPLOT/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf RM = rm -rf
CC = cc CC = gcc
CPP = c++ CPP = c++
DPX_DIR = ../.. DPX_DIR = ../..

2
trick_source/data_products/DPX/DPC/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf RM = rm -rf
CC = cc CC = gcc
CPP = c++ CPP = c++
DPX_DIR = .. DPX_DIR = ..

2
trick_source/data_products/DPX/DPM/makefile
View File

@ -2,7 +2,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf RM = rm -rf
CC = cc CC = gcc
CPP = c++ CPP = c++
DPX_DIR = .. DPX_DIR = ..

2
trick_source/data_products/EQParse/makefile
View File

@ -1,7 +1,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
CC = cc CC = gcc
OBJ_DIR = object_${TRICK_HOST_CPU} OBJ_DIR = object_${TRICK_HOST_CPU}
LIBDIR = ../lib_${TRICK_HOST_CPU} LIBDIR = ../lib_${TRICK_HOST_CPU}

2
trick_source/data_products/units/makefile
View File

@ -1,7 +1,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
CC = cc CC = gcc
CPP = c++ CPP = c++
ifndef TRICK_HOST_CPU ifndef TRICK_HOST_CPU

2
trick_source/sim_services/DataTypes/makefile
View File

@ -1,6 +1,6 @@
RM = rm -rf RM = rm -rf
CC = cc CC = gcc
CPP = c++ CPP = c++

2
trick_source/trick_utils/SAIntegrator/makefile
View File

@ -1,6 +1,6 @@
RM = rm -rf RM = rm -rf
CC = cc CC = gcc
CPP = c++ CPP = c++
CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS} CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}

2
trick_source/web/CivetServer/makefile
View File

@ -1,7 +1,7 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
RM = rm -rf RM = rm -rf
CC = cc CC = gcc
CPP = c++ CPP = c++
CURL = curl CURL = curl
MV = mv MV = mv