diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-07-25 09:42:18 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-07-25 09:42:18 -0700 |
| commit | 598d5240c0e4613dbe0569a1266693892a248e29 (patch) | |
| tree | adbc0c6dd17fb0258903da083365c0bb2674b3ec /tools/distrib/python | |
| parent | 224fe989e49d21eaae15b7ceba6c3891d28afe8c (diff) | |
Fix merge again
Diffstat (limited to 'tools/distrib/python')
| -rw-r--r-- | tools/distrib/python/grpcio_tools/setup.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py index 9d64782fd0..bb1f1cf085 100644 --- a/tools/distrib/python/grpcio_tools/setup.py +++ b/tools/distrib/python/grpcio_tools/setup.py @@ -143,11 +143,11 @@ def extension_modules(): plugin_sources = [os.path.join('grpc', 'tools', '_protoc_compiler.pyx')] else: plugin_sources = [os.path.join('grpc', 'tools', '_protoc_compiler.cpp')] - plugin_sources += [ - os.path.join('grpc', 'tools', 'main.cc'), - os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')] + [ - os.path.join(CC_INCLUDE, cc_file) - for cc_file in CC_FILES] + plugin_sources += [ + os.path.join('grpc', 'tools', 'main.cc'), + os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')] + [ + os.path.join(CC_INCLUDE, cc_file) + for cc_file in CC_FILES] plugin_ext = extension.Extension( name='grpc.tools._protoc_compiler', sources=plugin_sources, |