meson: require SecurityFramework when it's used as SHA1 backend
The Security framework is required when we use CommonCrypto either as HTTPS or SHA1 backend, but we only require it in case it is set up as HTTPS backend. Fix this. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
31eb6d7cf0
commit
d6787d9751
@@ -1329,7 +1329,7 @@ https_backend = get_option('https_backend')
|
||||
sha1_backend = get_option('sha1_backend')
|
||||
sha256_backend = get_option('sha256_backend')
|
||||
|
||||
security_framework = dependency('Security', required: https_backend == 'CommonCrypto')
|
||||
security_framework = dependency('Security', required: https_backend == 'CommonCrypto' or sha1_backend == 'CommonCrypto')
|
||||
core_foundation_framework = dependency('CoreFoundation', required: security_framework.found())
|
||||
if https_backend == 'auto' and security_framework.found()
|
||||
https_backend = 'CommonCrypto'
|
||||
|
||||
Reference in New Issue
Block a user