diff options
| author | Andrew Brown <andrew.brown@intel.com> | 2021-08-12 01:38:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 09:38:22 +0100 |
| commit | face127c59b2407a890b9a8935e1f9c79ceb6c7f (patch) | |
| tree | ddaeabbafd6b207f86002959523f8efaac0ccbd7 /projects/wasmtime | |
| parent | 7942bb4491a59cf1c1aece279bcd7687e05f7513 (diff) | |
| download | oss-fuzz-face127c59b2407a890b9a8935e1f9c79ceb6c7f.tar.gz | |
wasmtime: install a newer version of OCaml (#6205)
* wasmtime: install a newer version of OCaml
* Update Dockerfile
* wasmtime: move environment setup to build.sh
Diffstat (limited to 'projects/wasmtime')
| -rw-r--r-- | projects/wasmtime/Dockerfile | 8 | ||||
| -rwxr-xr-x | projects/wasmtime/build.sh | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/projects/wasmtime/Dockerfile b/projects/wasmtime/Dockerfile index dc87834f9..ea72bfb39 100644 --- a/projects/wasmtime/Dockerfile +++ b/projects/wasmtime/Dockerfile @@ -15,7 +15,13 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder -RUN apt-get update && apt-get install -y make autoconf automake libtool curl cmake python llvm-dev libclang-dev clang ocaml-nox +RUN apt-get update && apt-get install -y make autoconf automake libtool curl cmake python llvm-dev libclang-dev clang + +# Install a newer version of OCaml than provided by Ubuntu 16.04 (base version for this image) +RUN curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh -o install.sh && \ + echo | sh install.sh && \ + opam init --disable-sandboxing --yes && \ + opam install ocamlbuild --yes RUN git clone --depth 1 https://github.com/bytecodealliance/wasm-tools wasm-tools diff --git a/projects/wasmtime/build.sh b/projects/wasmtime/build.sh index 80423e376..b22a11be4 100755 --- a/projects/wasmtime/build.sh +++ b/projects/wasmtime/build.sh @@ -56,6 +56,9 @@ build() { done } +# Ensure OCaml environment is set up prior to Wasmtime build. +eval $(opam env) + # Build with peepmatic in order to enable the related fuzz targets. build wasmtime "" "" --features "peepmatic-fuzzing experimental_x64" |