Of course, my darn strict check on LLVM-11 backfires on an install sc…

…ript

Dockerfile

@@ -44,6 +44,17 @@ COPY ./tools/ /tools
 COPY ./scripts /scripts
 COPY setup_container.sh /setup_container.sh
 
-RUN ./setup_container.sh
+# Effectively the same as setup_container.sh
+RUN pushd /tools/btrace
+RUN ./compile.sh
+RUN popd
+
+RUN mkdir -p "$LAVA_DIR/tools/build"
+RUN mkdir -p "$LAVA_DIR/tools/install"
+
+RUN cmake -B"$LAVA_DIR/tools/build" -H"${LAVA_DIR}/tools" -DCMAKE_INSTALL_PREFIX="${LAVA_DIR}/tools/install"
+RUN make --no-print-directory -j4 install -C "${LAVA_DIR}/tools/build/lavaTool"
+
+RUN make --no-print-directory -j4 install -C "${LAVA_DIR}/tools/build/fbi"
 
 # Outside your container, you need to setup your postgres and init-host settings

install.sh

@@ -54,5 +54,10 @@ pip3 install --upgrade pip
 pip3 install -r requirements.txt
 progress "Installed Python requirements"
 
+if [ -z "${LLVM_DIR}" ]; then
+    export LLVM_DIR=/usr/lib/llvm-11
+    exit 1
+fi
+
 $SUDO bash setup_container.sh
 progress "Installed LAVA"