diff options
| author |  Eric Gribkoff <ericgribkoff@google.com> | 2018-08-22 21:01:58 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-22 21:01:58 -0700 |
| commit | dcbfa70226f1fb745f760d1be627899b1514bd8a (patch) | |
| tree | 524457d8ef89815b1d21c96b179a15e173f29eb6 /src/python/grpcio | |
| parent | e04ba7568cb956c84c90f74cfb2b5607a7012aa9 (diff) | |
| parent | 0ff641a2468e9c2563e2884a0aac987ea55849c4 (diff) | |
Merge pull request #16432 from ericgribkoff/allow_pthread_atfork_mac
Define the allow pthread atfork macro for gRPC Python MacOS builds
Diffstat (limited to 'src/python/grpcio')
| -rw-r--r-- | src/python/grpcio/commands.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py index 4c2ebaeaea..0a3097111f 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py @@ -265,8 +265,17 @@ class BuildExt(build_ext.build_ext): os.path.join(target_path, 'libgpr.a'), os.path.join(target_path, 'libgrpc.a') ] + # Running make separately for Mac means we lose all + # Extension.define_macros configured in setup.py. Re-add the macro + # for gRPC Core's fork handlers. + # TODO(ericgribkoff) Decide what to do about the other missing core + # macros, including GRPC_ENABLE_FORK_SUPPORT, which defaults to 1 + # on Linux but remains unset on Mac. + extra_defines = [ + 'EXTRA_DEFINES="GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1"' + ] make_process = subprocess.Popen( - ['make'] + targets, + ['make'] + extra_defines + targets, stdout=subprocess.PIPE, stderr=subprocess.PIPE) make_out, make_err = make_process.communicate() |