mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
It used to be that APPLE_COMMON_CRYPTO did nothing when BLK_SHA1 was
set. But APPLE_COMMON_CRYPTO is now used for more than just SHA1 (see
3ef2bca
) so make sure that the appropriate libraries are always set.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3ef2bcad02
commit
c984938f9c
4
Makefile
4
Makefile
|
@ -1167,6 +1167,9 @@ ifdef NEEDS_SSL_WITH_CRYPTO
|
|||
else
|
||||
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
|
||||
endif
|
||||
ifdef APPLE_COMMON_CRYPTO
|
||||
LIB_4_CRYPTO += -framework Security -framework CoreFoundation
|
||||
endif
|
||||
endif
|
||||
ifdef NEEDS_LIBICONV
|
||||
ifdef ICONVDIR
|
||||
|
@ -1398,7 +1401,6 @@ ifdef PPC_SHA1
|
|||
LIB_H += ppc/sha1.h
|
||||
else
|
||||
ifdef APPLE_COMMON_CRYPTO
|
||||
LIB_4_CRYPTO += -framework Security -framework CoreFoundation
|
||||
COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
|
||||
SHA1_HEADER = <CommonCrypto/CommonDigest.h>
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue