diff options
author | 2018-11-02 00:55:07 -0700 | |
---|---|---|
committer | 2018-11-02 00:55:07 -0700 | |
commit | f438d7c727e196b31dded8922ca22ab199dd12d5 (patch) | |
tree | c327cb8fdb7e73eced8162869c8b2156035ccd9f /src/python/grpcio/commands.py | |
parent | 4912fb2d04f87ddae44c5146b4c9dca0bc225d42 (diff) | |
parent | 53657b5de385ffc54e33899b3f2a87ff78d2952b (diff) |
Merge branch master into package-grpc-tools-doc
Diffstat (limited to 'src/python/grpcio/commands.py')
-rw-r--r-- | src/python/grpcio/commands.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py index 0a3097111f..3cb0eb179e 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py @@ -274,8 +274,14 @@ class BuildExt(build_ext.build_ext): extra_defines = [ 'EXTRA_DEFINES="GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1"' ] + # Ensure the BoringSSL are built instead of using system provided + # libraries. It prevents dependency issues while distributing to + # Mac users who use MacPorts to manage their libraries. #17002 + mod_env = dict(os.environ) + mod_env['REQUIRE_CUSTOM_LIBRARIES_opt'] = '1' make_process = subprocess.Popen( ['make'] + extra_defines + targets, + env=mod_env, stdout=subprocess.PIPE, stderr=subprocess.PIPE) make_out, make_err = make_process.communicate() |