From cdf2f2f8a34170d9e152efb1d283c66ca05dfa34 Mon Sep 17 00:00:00 2001 From: emkornfield Date: Thu, 16 Jul 2020 11:03:15 -0700 Subject: [PATCH] Update setup.py Remove windows. Use proper filter for mac. --- setup.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 42e34b11b7a..629b8f7ad89 100644 --- a/setup.py +++ b/setup.py @@ -22,9 +22,6 @@ import setuptools from distutils.unixccompiler import UnixCCompiler UnixCCompiler.src_extensions.append('.S') del UnixCCompiler -from distutils.msvccompiler import MSVCCompiler -MSVCCompiler.src_extensions.append('.asm') -del MSVCCompiler from distutils import cygwinccompiler from distutils import extension as _extension @@ -286,12 +283,7 @@ if BUILD_WITH_BORING_SSL_ASM: NO_BORING_ASM = False elif "mac" in util.get_platform() and "x86_64" in util.get_platform(): asm_files = [f for f in grpc_core_dependencies.ASM_SOURCE_FILES - if (LINUX_X86_64 in f or "hrss/asm" in f) - and "test" not in f] - NO_BORING_ASM = False - elif "win" in sys.platform and '64bit' in platform.architecture()[0]: - asm_files = [f for f in grpc_core_dependencies.ASM_SOURCE_FILES - if ("win-x86_64" in f) + if ("mac-x86_64" in f or "hrss/asm" in f) and "test" not in f] NO_BORING_ASM = False else: