From 9ba29521a04cad0e980e9c7d4f2322f67dd1dd20 Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Thu, 25 Apr 2019 22:07:15 -0400 Subject: [PATCH] restore a few pieces mistakingly dropped from amazon script during merge --- scripts/eosio_build_amazon.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/eosio_build_amazon.sh b/scripts/eosio_build_amazon.sh index 2ae1bea3f98..141a3af592a 100755 --- a/scripts/eosio_build_amazon.sh +++ b/scripts/eosio_build_amazon.sh @@ -114,6 +114,18 @@ fi printf "\\n" +### clean up force build before starting +if [ $FORCE_BUILD ];then + rm -rf \ + ${SRC_LOCATION}/cmake-$CMAKE_VERSION \ + ${SRC_LOCATION}/llvm ${OPT_LOCATION}/llvm4 \ + ${TMP_LOCATION}/clang8 ${OPT_LOCATION}/clang8 \ + ${SRC_LOCATION}/zlib ${OPT_LOCATION}/zlib \ + ${SRC_LOCATION}/boost \ + ${SRC_LOCATION}/mongodb-linux-x86_64-amazon-$MONGODB_VERSION \ + ${SRC_LOCATION}/mongo-c-driver-$MONGO_C_DRIVER_VERSION \ + ${SRC_LOCATION}/mongo-cxx-driver-r$MONGO_CXX_DRIVER_VERSION +fi printf "Checking CMAKE installation...\\n" if [ ! -e $CMAKE ] || [ $FORCE_BUILD ]; then @@ -134,9 +146,10 @@ fi if [ $? -ne 0 ]; then exit -1; fi + printf "\\n" -if $PIN_COMPILER; then +if [ $PIN_COMPILER ]; then printf "Checking Clang 8 support...\\n" if [ ! -d $CLANG8_ROOT ] || [ $FORCE_BUILD ]; then printf "Installing Clang 8...\\n"