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>
Brian Gernhardt committed
Aug 5, 2013 at 11:59 UTC
c984938f9c454255012086e1203504dc243a59bd
1 file changed
+3
-1
Makefile
+3
-1
@@ -1167,6 +1167,9 @@ ifdef NEEDS_SSL_WITH_CRYPTO
1167
else
1168
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
1169
endif
1170
+ifdef APPLE_COMMON_CRYPTO
1171
+ LIB_4_CRYPTO += -framework Security -framework CoreFoundation
1172
+endif
1173
endif
1174
ifdef NEEDS_LIBICONV
1175
ifdef ICONVDIR
@@ -1398,7 +1401,6 @@ ifdef PPC_SHA1
1401
LIB_H += ppc/sha1.h
1402
else
1403
ifdef APPLE_COMMON_CRYPTO
1401
- LIB_4_CRYPTO += -framework Security -framework CoreFoundation
1404
COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
1405
SHA1_HEADER = <CommonCrypto/CommonDigest.h>
1406
else