diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
| commit | 41113108303afbc1458c1c82b267cc17703ea8ce (patch) | |
| tree | 70ee5f7e6d383fbc5f125daf1b54e1e0766ab1b1 /generate_descriptor_proto.sh | |
| parent | 3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (diff) | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
| download | protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.gz protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.bz2 protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.zip | |
Merge branch 'master' of github.com:google/protobuf into integrate_from_master
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 |