diff options
| author | Brian Gernhardt <brian@gernhardtsoftware.com> | 2013-08-05 15:59:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 17:47:00 (GMT) |
| commit | c984938f9c454255012086e1203504dc243a59bd (patch) | |
| tree | a774348f463dea554535c6e8bcf500d298f66bbd /Makefile | |
| parent | 3ef2bcad02efd6219f4ce599754c15e63b6af0dc (diff) | |
| download | git-c984938f9c454255012086e1203504dc243a59bd.zip git-c984938f9c454255012086e1203504dc243a59bd.tar.gz git-c984938f9c454255012086e1203504dc243a59bd.tar.bz2 | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |