From b2cf73e1f81a9c9eeff6dab8f8980c1711784796 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 28 Aug 2017 12:18:45 +0200 Subject: [PATCH] prevent submodule headers from influencing the build --- test/distrib/cpp/run_distrib_test_cmake.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/distrib/cpp/run_distrib_test_cmake.sh b/test/distrib/cpp/run_distrib_test_cmake.sh index a81de57810b..ead8cc10bc7 100755 --- a/test/distrib/cpp/run_distrib_test_cmake.sh +++ b/test/distrib/cpp/run_distrib_test_cmake.sh @@ -31,6 +31,7 @@ cd cmake/build cmake -DCMAKE_BUILD_TYPE=Release ../.. make -j4 install cd ../../../../.. +rm -rf third_party/cares/cares # wipe out to prevent influencing the grpc build # Install zlib cd third_party/zlib @@ -39,6 +40,7 @@ cd cmake/build cmake -DCMAKE_BUILD_TYPE=Release ../.. make -j4 install cd ../../../.. +rm -rf third_party/zlib # wipe out to prevent influencing the grpc build # Install protobuf cd third_party/protobuf @@ -47,8 +49,7 @@ cd cmake/build cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release .. make -j4 install cd ../../../.. - -# TODO: Install boringssl +rm -rf third_party/protobuf # wipe out to prevent influencing the grpc build # Install gRPC mkdir -p cmake/build