aboutsummaryrefslogtreecommitdiff
path: root/ci/lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-12-26 11:42:07 +0900
committerJunio C Hamano <gitster@pobox.com>2022-12-26 11:42:07 +0900
commitcd2cc44c023eb92cede5849b00cdc84274885985 (patch)
tree65fe4a4963f7fabaa5b317a2230a0edc2ab4ae9e /ci/lib.sh
parent3613ab5df571af2fb4106f5bb20a666779d269a3 (diff)
parent35898ad24d83317135d7fdad601dc17375ac373e (diff)
downloadgit-cd2cc44c023eb92cede5849b00cdc84274885985.tar.xz
Merge branch 'ab/darwin-default-to-sha1dc'
Use the SHA1DC implementation on macOS, just like other platforms, by default. * ab/darwin-default-to-sha1dc: Makefile: use sha1collisiondetection by default on OSX and Darwin
Diffstat (limited to 'ci/lib.sh')
-rwxr-xr-xci/lib.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index 706e3ba7e9..db7105e8a8 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -258,8 +258,7 @@ macos-*)
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
else
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
- MAKEFLAGS="$MAKEFLAGS NO_APPLE_COMMON_CRYPTO=NoThanks"
- MAKEFLAGS="$MAKEFLAGS NO_OPENSSL=NoThanks"
+ MAKEFLAGS="$MAKEFLAGS APPLE_COMMON_CRYPTO_SHA1=Yes"
fi
;;
esac