diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:28:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:28:15 -0700 |
| commit | 9a7eaad65ff5f6bf5c7fda427bcc2b94f6ada598 (patch) | |
| tree | e81115c0c556a4f5d4d72b61c20150bb2a0ba402 /Makefile | |
| parent | 4aa04a8f8d8cac0e0fb61251fbc71f292d4ab801 (diff) | |
| parent | f2be034c6918e7f5d42da5ad1cf9d3ef51c25a77 (diff) | |
| download | git-9a7eaad65ff5f6bf5c7fda427bcc2b94f6ada598.tar.gz | |
Merge branch 'da/darwin'
* da/darwin:
OS X: Fix redeclaration of die warning
Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
imap-send: use Apple's Security framework for base64 encoding
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1182,6 +1182,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 |