Merge branch 'tr/log-full-diff-keep-true-parents'

diff --git a/Makefile b/Makefile
index 3588ca1b6a575e8bb732dcc04b7c59dcb7f15cf4..7051956333422b5d355528568706e4a675d1a246 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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