Merge pull request #751 from murgatroid99/grpc-tools-cmake-reconfigure

Clean more thoroughly to ensure cmake reconfigures
This commit is contained in:
Michael Lumish 2019-02-21 16:57:55 -08:00 committed by GitHub
commit fe35386a93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions

View File

@ -10,11 +10,10 @@ protobuf_base=$base/deps/protobuf
tools_version=$(jq '.version' < package.json | tr -d '"')
# Note: $ARTIFACTS_OUT should not be in this directory
out_dir=$ARTIFACTS_OUT/grpc-tools/v$tools_version
mkdir -p "$out_dir"
mkdir -p "$base/build/bin"
case $(uname -s) in
Linux)
platform=linux
@ -37,8 +36,12 @@ for arch in "${arch_list[@]}"; do
esac
rm -f $base/build/bin/protoc
rm -f $base/build/bin/grpc_node_plugin
rm -f CMakeCache.txt
rm -f $base/CMakeCache.txt
rm -rf $base/CMakeFiles
rm -f $protobuf_base/CMakeCache.txt
rm -rf $protobuf_base/CMakeFiles
cmake $toolchain_flag . && cmake --build . --target clean && cmake --build . -- -j 12
mkdir -p "$base/build/bin"
cp -L $protobuf_base/protoc $base/build/bin/protoc
cp $base/grpc_node_plugin $base/build/bin/
file $base/build/bin/*