| commit | a21bf2e6466095c7a2cdb991017da9639cf496e5 | [log] [tgz] |
|---|---|---|
| author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | Mon Aug 25 23:26:40 2014 +0000 |
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | Mon Aug 25 23:26:40 2014 +0000 |
| tree | 793371176244897b98707f7bf6020b1d5bac03ce | |
| parent | 1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3 [diff] [blame] |
merge 2.6.0 to trunk
diff --git a/python/setup.py b/python/setup.py index 6eecd48..9441d0e 100755 --- a/python/setup.py +++ b/python/setup.py
@@ -138,10 +138,9 @@ if __name__ == '__main__': ext_module_list = [] - nocpp = '--nocpp_implementation' - if nocpp in sys.argv: + cpp_impl = '--cpp_implementation' + if cpp_impl in sys.argv: sys.argv.remove(cpp_impl) - else: # C++ implementation extension ext_module_list.append(Extension( "google.protobuf.pyext._message",