Skip to content

Commit

Permalink
Avoid cmake reinstall
Browse files Browse the repository at this point in the history
  • Loading branch information
adpaco-aws committed Oct 23, 2023
1 parent 564180d commit 921b663
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 27 deletions.
4 changes: 2 additions & 2 deletions scripts/setup/al2/install_cbmc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion scripts/setup/al2/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
24 changes: 0 additions & 24 deletions scripts/setup/al2/reinstall_cmake.sh

This file was deleted.

0 comments on commit 921b663

Please sign in to comment.