diff options
| author | Tyson Smith <tysmith@users.noreply.github.com> | 2021-03-19 10:19:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 10:19:21 -0700 |
| commit | 6998e8e9dca5ff2c4d9e829e8edb10bfd78aa5a2 (patch) | |
| tree | 6deebbd27fe23ef139e38a774132a8f3577b1a9a | |
| parent | cb083cb3658c44df432c188f68f5a1ed297310cf (diff) | |
| download | oss-fuzz-6998e8e9dca5ff2c4d9e829e8edb10bfd78aa5a2.tar.gz | |
[firefox/spidermonkey] Fix mach call and install dep (#5446)
| -rw-r--r-- | projects/firefox/Dockerfile | 3 | ||||
| -rwxr-xr-x | projects/firefox/build.sh | 2 | ||||
| -rw-r--r-- | projects/spidermonkey-ufi/Dockerfile | 3 | ||||
| -rwxr-xr-x | projects/spidermonkey-ufi/build.sh | 2 | ||||
| -rw-r--r-- | projects/spidermonkey/Dockerfile | 1 | ||||
| -rwxr-xr-x | projects/spidermonkey/build.sh | 2 |
6 files changed, 8 insertions, 5 deletions
diff --git a/projects/firefox/Dockerfile b/projects/firefox/Dockerfile index 3433f9dc0..1d19ca82e 100644 --- a/projects/firefox/Dockerfile +++ b/projects/firefox/Dockerfile @@ -19,6 +19,7 @@ RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \ gawk \ libstdc++6 \ + m4 \ python \ software-properties-common @@ -31,5 +32,5 @@ WORKDIR mozilla-central # Install OS dependencies. # Will be re-run in build.sh to install missing dependencies. ENV SHELL /bin/bash -RUN ./mach bootstrap --no-interactive --application-choice browser +RUN ./mach --no-interactive bootstrap --application-choice browser COPY build.sh target.c *.options mozconfig.* $SRC/ diff --git a/projects/firefox/build.sh b/projects/firefox/build.sh index a41b99bc8..aebd619bd 100755 --- a/projects/firefox/build.sh +++ b/projects/firefox/build.sh @@ -44,7 +44,7 @@ export MOZCONFIG=$SRC/mozconfig.$SANITIZER # Install remaining dependencies. export SHELL=/bin/bash -./mach bootstrap --no-interactive --application-choice browser +./mach --no-interactive bootstrap --application-choice browser # Skip patches for now rm tools/fuzzing/libfuzzer/patches/*.patch diff --git a/projects/spidermonkey-ufi/Dockerfile b/projects/spidermonkey-ufi/Dockerfile index 8caec014f..25e4d2d60 100644 --- a/projects/spidermonkey-ufi/Dockerfile +++ b/projects/spidermonkey-ufi/Dockerfile @@ -19,7 +19,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ autoconf2.13 \ python \ libc++1 \ - libc++abi1 + libc++abi1 \ + m4 # This wrapper of cargo seems to interfere with our build system. RUN rm -f /usr/local/bin/cargo diff --git a/projects/spidermonkey-ufi/build.sh b/projects/spidermonkey-ufi/build.sh index 31c5b9535..9f703305c 100755 --- a/projects/spidermonkey-ufi/build.sh +++ b/projects/spidermonkey-ufi/build.sh @@ -23,7 +23,7 @@ FUZZ_TARGETS=( # Install dependencies. export SHELL=/bin/bash -../../mach bootstrap --no-interactive --application-choice browser +../../mach --no-interactive bootstrap --application-choice browser autoconf2.13 diff --git a/projects/spidermonkey/Dockerfile b/projects/spidermonkey/Dockerfile index 4e1f28291..9c74dce54 100644 --- a/projects/spidermonkey/Dockerfile +++ b/projects/spidermonkey/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \ autoconf2.13 \ libc++1 \ libc++abi1 \ + m4 \ yasm \ python diff --git a/projects/spidermonkey/build.sh b/projects/spidermonkey/build.sh index d5f34b80f..bf2e03bfc 100755 --- a/projects/spidermonkey/build.sh +++ b/projects/spidermonkey/build.sh @@ -17,7 +17,7 @@ # Install dependencies. export SHELL=/bin/bash -../../mach bootstrap --no-interactive --application-choice browser +../../mach --no-interactive bootstrap --application-choice browser autoconf2.13 |