diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-26 11:42:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-26 11:42:07 +0900 |
| commit | cd2cc44c023eb92cede5849b00cdc84274885985 (patch) | |
| tree | 65fe4a4963f7fabaa5b317a2230a0edc2ab4ae9e /ci/lib.sh | |
| parent | 3613ab5df571af2fb4106f5bb20a666779d269a3 (diff) | |
| parent | 35898ad24d83317135d7fdad601dc17375ac373e (diff) | |
| download | git-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-x | ci/lib.sh | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 |
