diff options
| author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-25 23:26:40 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-25 23:26:40 +0000 |
| commit | a21bf2e6466095c7a2cdb991017da9639cf496e5 (patch) | |
| tree | 793371176244897b98707f7bf6020b1d5bac03ce /python/setup.py | |
| parent | 1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3 (diff) | |
| download | protobuf-a21bf2e6466095c7a2cdb991017da9639cf496e5.tar.gz protobuf-a21bf2e6466095c7a2cdb991017da9639cf496e5.tar.bz2 protobuf-a21bf2e6466095c7a2cdb991017da9639cf496e5.zip | |
merge 2.6.0 to trunkv2.6.0
Diffstat (limited to 'python/setup.py')
| -rwxr-xr-x | python/setup.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/python/setup.py b/python/setup.py index 6eecd489..9441d0e1 100755 --- a/python/setup.py +++ b/python/setup.py @@ -138,10 +138,9 @@ class build_py(_build_py): 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", |