mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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
This commit is contained in:
commit
cd2cc44c02
10
Makefile
10
Makefile
|
@ -511,10 +511,8 @@ include shared.mak
|
|||
# Define BLK_SHA1 to make use of optimized C SHA-1 routines bundled
|
||||
# with git (in the block-sha1/ directory).
|
||||
#
|
||||
# Define NO_APPLE_COMMON_CRYPTO on OSX to opt-out of using the
|
||||
# "APPLE_COMMON_CRYPTO" backend for SHA-1, which is currently the
|
||||
# default on that OS. On macOS 01.4 (Tiger) or older,
|
||||
# NO_APPLE_COMMON_CRYPTO is defined by default.
|
||||
# Define APPLE_COMMON_CRYPTO_SHA1 to use Apple's CommonCrypto for
|
||||
# SHA-1.
|
||||
#
|
||||
# If don't enable any of the *_SHA1 settings in this section, Git will
|
||||
# default to its built-in sha1collisiondetection library, which is a
|
||||
|
@ -1911,7 +1909,7 @@ ifdef NO_POSIX_GOODIES
|
|||
BASIC_CFLAGS += -DNO_POSIX_GOODIES
|
||||
endif
|
||||
|
||||
ifdef APPLE_COMMON_CRYPTO
|
||||
ifdef APPLE_COMMON_CRYPTO_SHA1
|
||||
# Apple CommonCrypto requires chunking
|
||||
SHA1_MAX_BLOCK_SIZE = 1024L*1024L*1024L
|
||||
endif
|
||||
|
@ -1928,7 +1926,7 @@ ifdef BLK_SHA1
|
|||
LIB_OBJS += block-sha1/sha1.o
|
||||
BASIC_CFLAGS += -DSHA1_BLK
|
||||
else
|
||||
ifdef APPLE_COMMON_CRYPTO
|
||||
ifdef APPLE_COMMON_CRYPTO_SHA1
|
||||
COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
|
||||
BASIC_CFLAGS += -DSHA1_APPLE
|
||||
else
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue