Skip to content

Commit

Permalink
vast: update to reflect simplified cmake workflow (#81)
Browse files Browse the repository at this point in the history
  • Loading branch information
xlauko authored May 26, 2024
1 parent 797d083 commit afa9594
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
11 changes: 1 addition & 10 deletions Dockerfile.vast
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,8 @@ RUN apt-get install -y -q \
RUN curl -sL https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz \
| tar zx -C /usr --strip-components=1

RUN bash -c "$(curl -s -o - https://apt.llvm.org/llvm.sh)" llvm.sh 17

RUN apt-get install -y -q \
libstdc++-12-dev \
llvm-17 \
libmlir-17 \
libmlir-17-dev \
mlir-17-tools \
libclang-17-dev

RUN pip3 install lit
RUN bash -c "$(curl -s -o - https://raw.githubusercontent.com/trailofbits/vast/master/scripts/setup_llvm_dependencies.sh)"

RUN mkdir -p /root
COPY vast /root/
Expand Down
13 changes: 2 additions & 11 deletions vast/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,8 @@ git clone -q --depth 1 --recursive --single-branch -b "${BRANCH}" "${URL}" "vast

cd "vast-${VERSION}"

export CC=/usr/bin/clang-17
export CXX=/usr/bin/clang++-17
cmake --preset ninja-multi-default \
--toolchain ./cmake/lld.toolchain.cmake \
--install-prefix "${STAGING_DIR}" \
-DLLVM_EXTERNAL_LIT=/usr/local/bin/lit \
-DCMAKE_INSTALL_RPATH:PATH="\$ORIGIN/../lib" \
-DCMAKE_PREFIX_PATH="/usr/lib/llvm-17;/usr/lib/llvm-17/lib/cmake/mlir;/usr/lib/llvm-17/lib/cmake/clang"

cmake --build --preset ninja-rel
cmake --install ./builds/ninja-multi-default
cmake --workflow --preset compiler-explorer
cmake --install ./builds/compiler-explorer

# Copy all shared object dependencies into the release directory to create a hermetic build, per
# Compiler Explorer requirements. Update rpath for these objects to $ORIGIN.
Expand Down

0 comments on commit afa9594

Please sign in to comment.