aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYilun Chong <chongyilun250@sina.com>2018-07-30 11:43:15 -0700
committerGitHub <noreply@github.com>2018-07-30 11:43:15 -0700
commit751bf9783fdc99d8de77756f7d2b2d07207589ef (patch)
tree1b93d4c2d89cf9bd54829c06af0636de26cc024a
parentf6a7ca186708e7f4eff4c4ff277205db60988a1d (diff)
parent517dee8da3d3d27790ed3014f711b8cdf34fc82e (diff)
downloadprotobuf-751bf9783fdc99d8de77756f7d2b2d07207589ef.tar.gz
protobuf-751bf9783fdc99d8de77756f7d2b2d07207589ef.tar.bz2
protobuf-751bf9783fdc99d8de77756f7d2b2d07207589ef.zip
Merge pull request #4974 from BSBandme/fix_benchmark
fix third_party/benchmark submodule init
-rw-r--r--benchmarks/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index 4bf57026..4f7df646 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -90,8 +90,7 @@ $(benchmarks_protoc_outputs_proto2_header): protoc_middleman2
initialize_submodule:
oldpwd=`pwd`
- cd $(top_srcdir)/third_party
- git submodule update --init -r
+ cd $(top_srcdir) && git submodule update --init -r third_party/benchmark
cd $(top_srcdir)/third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make
cd $$oldpwd
touch initialize_submodule