summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-05 14:36:25 -0700
committerJunio C Hamano <gitster@pobox.com>2022-05-05 14:36:25 -0700
commit565442c35884e320633328218e0f6dd13f3657d3 (patch)
treedfe048e007c321d3c55f384e2be5ba5048841d8a
parentMerge branch 'jc/cocci-xstrdup-or-null-fix' into maint (diff)
parentCI: select CC based on CC_PACKAGE (again) (diff)
downloadgit-565442c35884e320633328218e0f6dd13f3657d3.tar.gz
git-565442c35884e320633328218e0f6dd13f3657d3.zip
Merge branch 'ab/cc-package-fixes' into maint
Correct choices of C compilers used in various CI jobs. source: <patch-v3-1.1-8b3444ecc87-20220422T092015Z-avarab@gmail.com> * ab/cc-package-fixes: CI: select CC based on CC_PACKAGE (again)
-rwxr-xr-xci/lib.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index cbc2f8f1ca..86e37da9bc 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -122,7 +122,7 @@ then
test macos != "$CI_OS_NAME" || CI_OS_NAME=osx
CI_REPO_SLUG="$GITHUB_REPOSITORY"
CI_JOB_ID="$GITHUB_RUN_ID"
- CC="${CC:-gcc}"
+ CC="${CC_PACKAGE:-${CC:-gcc}}"
DONT_SKIP_TAGS=t
cache_dir="$HOME/none"