Merge pull request #24449 from mtorromeo/patch-1

Do not build with boringssl ASM when using system openssl
4 years ago · fbffae6903
parent 914fbf45cf 770d1d0a05
commit fbffae6903
1 changed files with 1 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@ -289,7 +289,7 @@ DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
 asm_files = []

 asm_key = ''
-if BUILD_WITH_BORING_SSL_ASM:
+if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL:
    LINUX_X86_64 = 'linux-x86_64'
    LINUX_ARM = 'linux-arm'
    if LINUX_X86_64 == util.get_platform():