From 7e719c99e27562f31868e5d0fd1c455e6519bba3 Mon Sep 17 00:00:00 2001 From: Mike Sarahan Date: Tue, 18 Feb 2020 13:53:05 -0600 Subject: [PATCH 2/7] fix win setup cmds Co-Authored-By: Julien Schueller Co-Authored-By: Nicholas Bollweg Co-Authored-By: Marius van Niekerk Co-Authored-By: H. Vetinari --- setup.py | 9 ++++----- src/python/grpcio/commands.py | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index bea7f92e15..a46c3ae795 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,6 @@ from distutils.unixccompiler import UnixCCompiler UnixCCompiler.src_extensions.append('.S') del UnixCCompiler -from distutils import cygwinccompiler from distutils import extension as _extension from distutils import util import os @@ -203,6 +202,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value( def check_linker_need_libatomic(): + if sys.platform == 'win32': + return False + """Test if linker on system needs libatomic.""" code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') @@ -247,10 +249,6 @@ if EXTRA_ENV_COMPILE_ARGS is None: EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime32 -D_timeb=__timeb32 -D_ftime_s=_ftime32_s' else: EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64' - else: - # We need to statically link the C++ Runtime, only the C runtime is - # available dynamically - EXTRA_ENV_COMPILE_ARGS += ' /MT' elif "linux" in sys.platform: EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' elif "darwin" in sys.platform: @@ -263,6 +261,7 @@ if EXTRA_ENV_LINK_ARGS is None: if check_linker_need_libatomic(): EXTRA_ENV_LINK_ARGS += ' -latomic' elif "win32" in sys.platform and sys.version_info < (3, 5): + from distutils import cygwinccompiler msvcr = cygwinccompiler.get_msvcr()[0] EXTRA_ENV_LINK_ARGS += ( ' -static-libgcc -static-libstdc++ -mcrtdll={msvcr}' diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py index d93b6c7039..024512624a 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py @@ -226,6 +226,8 @@ class BuildExt(build_ext.build_ext): """Test if default compiler is okay with specifying c++ version when invoked in C mode. GCC is okay with this, while clang is not. """ + if sys.platform == "win32": + return False try: # TODO(lidiz) Remove the generated a.out for success tests. cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++14', '-'], -- 2.37.0.windows.1