diff options
| author | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
| commit | 2d9b1c592ff7319ee9d6520c9df4838087522e05 (patch) | |
| tree | 6eec7e633840b5b60cc85e20f6365df0702e6911 /generate_descriptor_proto.sh | |
| parent | 8a888922a9ac181a3fb47d00d497cde85ec4987a (diff) | |
| parent | 38da6583b1416a7c1594bffec3cdbb8856a72353 (diff) | |
| download | protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.gz protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.bz2 protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.zip | |
Merge pull request #382 from jtattermusch/integrate_from_master
Integrate changes from latest master branch into csharp branch.
Diffstat (limited to 'generate_descriptor_proto.sh')
| -rwxr-xr-x | generate_descriptor_proto.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/generate_descriptor_proto.sh b/generate_descriptor_proto.sh index b25a3c6a..2dad36ab 100755 --- a/generate_descriptor_proto.sh +++ b/generate_descriptor_proto.sh @@ -27,6 +27,7 @@ __EOF__ fi cd src +make $@ google/protobuf/stubs/pbconfig.h CORE_PROTO_IS_CORRECT=0 while [ $CORE_PROTO_IS_CORRECT -ne 1 ] do |