Skip to content
Snippets Groups Projects
Commit 598d5240 authored by murgatroid99's avatar murgatroid99
Browse files

Fix merge again

parent 224fe989
No related branches found
No related tags found
No related merge requests found
...@@ -143,11 +143,11 @@ def extension_modules(): ...@@ -143,11 +143,11 @@ def extension_modules():
plugin_sources = [os.path.join('grpc', 'tools', '_protoc_compiler.pyx')] plugin_sources = [os.path.join('grpc', 'tools', '_protoc_compiler.pyx')]
else: else:
plugin_sources = [os.path.join('grpc', 'tools', '_protoc_compiler.cpp')] plugin_sources = [os.path.join('grpc', 'tools', '_protoc_compiler.cpp')]
plugin_sources += [ plugin_sources += [
os.path.join('grpc', 'tools', 'main.cc'), os.path.join('grpc', 'tools', 'main.cc'),
os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')] + [ os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc')] + [
os.path.join(CC_INCLUDE, cc_file) os.path.join(CC_INCLUDE, cc_file)
for cc_file in CC_FILES] for cc_file in CC_FILES]
plugin_ext = extension.Extension( plugin_ext = extension.Extension(
name='grpc.tools._protoc_compiler', name='grpc.tools._protoc_compiler',
sources=plugin_sources, sources=plugin_sources,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment