aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-04 09:51:29 -0700
committerJunio C Hamano <gitster@pobox.com>2022-05-04 09:51:29 -0700
commit73f96c977293a45688881e5de69c26f6f70942fd (patch)
tree984e08aaacc26fd55672ce47c8ce39c22615ce5d
parent8b28e2e2e4abd0e9cffe0d85afd6f0c0346bb948 (diff)
parent3506cae04feb8996ade646c7533bb4cd1e0bff9e (diff)
downloadgit-73f96c977293a45688881e5de69c26f6f70942fd.tar.xz
Merge branch 'ab/cc-package-fixes'
Correct choices of C compilers used in various CI jobs. * 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"