diff options
author | Yilun Chong <yilunchong@google.com> | 2018-04-10 14:37:33 -0700 |
---|---|---|
committer | Yilun Chong <yilunchong@google.com> | 2018-04-10 14:37:33 -0700 |
commit | 76d76ae39c87815f114e7087ff483565fa86d9ff (patch) | |
tree | 3bd0ee3276ad157be1a3df74061e66a27960f437 /tests.sh | |
parent | c703061d4993904d1fb42e9ae88034112eceb261 (diff) | |
parent | 805174eda2356df1b01752c8bc57019e696e0a75 (diff) | |
download | protobuf-76d76ae39c87815f114e7087ff483565fa86d9ff.tar.gz protobuf-76d76ae39c87815f114e7087ff483565fa86d9ff.tar.bz2 protobuf-76d76ae39c87815f114e7087ff483565fa86d9ff.zip |
fix conflicts
Diffstat (limited to 'tests.sh')
-rwxr-xr-x | tests.sh | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -27,6 +27,9 @@ internal_build_cpp() { export CXX="g++-4.8" CC="gcc-4.8" fi + # Initialize any submodules. + git submodule update --init --recursive + ./autogen.sh ./configure CXXFLAGS="-fPIC" # -fPIC is needed for python cpp test. # See python/setup.py for more details @@ -53,6 +56,8 @@ build_cpp() { } build_cpp_distcheck() { + # Initialize any submodules. + git submodule update --init --recursive ./autogen.sh ./configure make dist |