diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2020-01-28 15:41:49 +0100 |
|---|---|---|
| committer | Abhishek Arya <inferno@chromium.org> | 2020-01-28 06:41:49 -0800 |
| commit | 96c9cd26c2e77a85f5ade9e50296edd20b64cac6 (patch) | |
| tree | 56ecfb139e5b4c9513a3aca142b0b7377c267421 | |
| parent | e82397baf623b69e17f29115817c5415f52df32b (diff) | |
| download | oss-fuzz-96c9cd26c2e77a85f5ade9e50296edd20b64cac6.tar.gz | |
Try to fix the wasmtime Rust build (#3298)
This is an attempt to fixup the errors found on #3292. Although I'm not
certain where the error was coming from this switches the Rust
installation to being in `PATH` by default so there's no need to
`source` any scripts to get access to the Rust compiler.
| -rw-r--r-- | projects/wasmtime/Dockerfile | 3 | ||||
| -rwxr-xr-x | projects/wasmtime/build.sh | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/projects/wasmtime/Dockerfile b/projects/wasmtime/Dockerfile index bb3f388f8..a70765b01 100644 --- a/projects/wasmtime/Dockerfile +++ b/projects/wasmtime/Dockerfile @@ -18,8 +18,9 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER foote@fastly.com RUN apt-get update && apt-get install -y make autoconf automake libtool curl cmake python llvm-dev libclang-dev clang +ENV CARGO_HOME=/rust RUSTUP_HOME=/rust/rustup PATH=$PATH:/rust/bin RUN curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly -RUN /bin/bash -c "source $HOME/.cargo/env && cargo install cargo-fuzz" +RUN cargo install cargo-fuzz RUN git clone --depth 1 https://github.com/bytecodealliance/wasmtime wasmtime WORKDIR wasmtime diff --git a/projects/wasmtime/build.sh b/projects/wasmtime/build.sh index 78916c375..314f14a5d 100755 --- a/projects/wasmtime/build.sh +++ b/projects/wasmtime/build.sh @@ -17,13 +17,11 @@ # Note: This project creates Rust fuzz targets exclusively -source $HOME/.cargo/env - export CUSTOM_LIBFUZZER_PATH="$LIB_FUZZING_ENGINE_DEPRECATED" export CUSTOM_LIBFUZZER_STD_CXX=c++ PROJECT_DIR=$SRC/wasmtime -# Because Rust does not support sanitizers via CFLAGS/CXXFLAGS, the environment +# Because Rust does not support sanitizers via CFLAGS/CXXFLAGS, the environment # variables are overridden with values from base-images/base-clang only export CFLAGS="-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" |