From 26731440ee60ff4a8368273120d3d652651f4443 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Mon, 12 Feb 2018 08:55:15 -0700 Subject: [PATCH] build: use conditional CC/CXX assignment for generated mk/cc.mk This ensures that if user specifies an alternate CC/CXX after cc.mk was already generated, that the build will pick up the difference, regenerate mk/cc.mk and trigger a rebuild. Signed-off-by: Jim Harris Change-Id: I90c38c7b8eb09a5575c429769ba57f4e167fa4b0 Reviewed-on: https://review.gerrithub.io/399431 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System --- scripts/detect_cc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/detect_cc.sh b/scripts/detect_cc.sh index 1c2742a0f..936520e36 100755 --- a/scripts/detect_cc.sh +++ b/scripts/detect_cc.sh @@ -74,7 +74,7 @@ if [ "$LTO" = "y" ]; then fi fi -echo "CC=$CC" -echo "CXX=$CXX" +echo "CC?=$CC" +echo "CXX?=$CXX" echo "CCAR=$CCAR" echo "CC_TYPE=$CC_TYPE"