From 921b663ca13bcae90a80ef8c230c8c82e6511730 Mon Sep 17 00:00:00 2001
From: Adrian Palacios <accorell@amazon.com>
Date: Mon, 23 Oct 2023 11:29:55 -0400
Subject: [PATCH] Avoid cmake reinstall

---
 scripts/setup/al2/install_cbmc.sh    |  4 ++--
 scripts/setup/al2/install_deps.sh    |  6 +++++-
 scripts/setup/al2/reinstall_cmake.sh | 24 ------------------------
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100755 scripts/setup/al2/reinstall_cmake.sh

diff --git a/scripts/setup/al2/install_cbmc.sh b/scripts/setup/al2/install_cbmc.sh
index 39af92e0693b..d12045483c1f 100755
--- a/scripts/setup/al2/install_cbmc.sh
+++ b/scripts/setup/al2/install_cbmc.sh
@@ -24,8 +24,8 @@ pushd "${WORK_DIR}"
 mkdir build
 git submodule update --init
 
-cmake -S . -Bbuild -DWITH_JBMC=OFF -Dsat_impl="minisat2;cadical"
-make -C build -j$(nproc)
+cmake3 -S . -Bbuild -DWITH_JBMC=OFF -Dsat_impl="minisat2;cadical"
+cmake3 --build build -- -j$(nproc)
 sudo make -C build install
 
 popd
diff --git a/scripts/setup/al2/install_deps.sh b/scripts/setup/al2/install_deps.sh
index c9178b6537be..01675fc65774 100755
--- a/scripts/setup/al2/install_deps.sh
+++ b/scripts/setup/al2/install_deps.sh
@@ -5,7 +5,12 @@
 set -eu
 
 # Dependencies.
+# Note: CMake 3.8 or higher is required to build CBMC, but those versions are
+# only available in AWS AMIs through `cmake3`. So we install `cmake3` and use it
+# to build CBMC.
 DEPS=(
+  cmake
+  cmake3
   git
   openssl-devel
   python3-pip
@@ -24,7 +29,6 @@ python3 -m pip install autopep8
 # Get the directory containing this script
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-${SCRIPT_DIR}/reinstall_cmake.sh
 ${SCRIPT_DIR}/install_cbmc.sh
 ${SCRIPT_DIR}/install_viewer.sh
 # The Kissat installation script is platform-independent, so is placed one level up
diff --git a/scripts/setup/al2/reinstall_cmake.sh b/scripts/setup/al2/reinstall_cmake.sh
deleted file mode 100755
index b6efa35094ce..000000000000
--- a/scripts/setup/al2/reinstall_cmake.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copyright Kani Contributors
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-
-set -eux
-
-CMAKE_VERSION="3.27.7"
-
-# Remove other versions of CMake
-sudo yum -y remove cmake
-
-sudo rm -rf /tmp/cmake_installation
-mkdir /tmp/cmake_installation
-pushd /tmp/cmake_installation
-
-wget https://github.com/Kitware/CMake/releases/download/v"${CMAKE_VERSION}"/cmake-"${CMAKE_VERSION}".tar.gz
-tar -xzvf cmake-"${CMAKE_VERSION}".tar.gz
-cd cmake-"${CMAKE_VERSION}"
-
-./bootstrap
-make -j$(nproc)
-sudo make install
-
-popd
\ No newline at end of file