diff options
| author | Christian Holler (:decoder) <choller@mozilla.com> | 2021-03-11 21:48:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 12:48:11 -0800 |
| commit | a15ab02cc449c5b9e95bef3dc0f7ea191a984afd (patch) | |
| tree | 333e2b5fb8602af8a04cea6a6e04e4d3f06917e2 /projects | |
| parent | a0fb9a91ba7cace8a5a6c4ada704498670e0135e (diff) | |
| download | oss-fuzz-a15ab02cc449c5b9e95bef3dc0f7ea191a984afd.tar.gz | |
[firefox/spidermonkey] Remove cargo wrapper in /usr/local/bin to fix builds (#5369)
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/firefox/Dockerfile | 4 | ||||
| -rw-r--r-- | projects/spidermonkey-ufi/Dockerfile | 4 | ||||
| -rw-r--r-- | projects/spidermonkey/Dockerfile | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/projects/firefox/Dockerfile b/projects/firefox/Dockerfile index 18543d582..3433f9dc0 100644 --- a/projects/firefox/Dockerfile +++ b/projects/firefox/Dockerfile @@ -21,6 +21,10 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco libstdc++6 \ python \ software-properties-common + +# This wrapper of cargo seems to interfere with our build system. +RUN rm -f /usr/local/bin/cargo + RUN git clone --depth 1 https://github.com/mozilla/gecko-dev mozilla-central RUN git clone --depth 1 https://github.com/mozillasecurity/fuzzdata WORKDIR mozilla-central diff --git a/projects/spidermonkey-ufi/Dockerfile b/projects/spidermonkey-ufi/Dockerfile index bf95bdfa7..8caec014f 100644 --- a/projects/spidermonkey-ufi/Dockerfile +++ b/projects/spidermonkey-ufi/Dockerfile @@ -20,6 +20,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ python \ libc++1 \ libc++abi1 + +# This wrapper of cargo seems to interfere with our build system. +RUN rm -f /usr/local/bin/cargo + RUN git clone --depth=1 https://github.com/mozilla/gecko-dev mozilla-central WORKDIR mozilla-central/js/src/ COPY build.sh target.c $SRC/ diff --git a/projects/spidermonkey/Dockerfile b/projects/spidermonkey/Dockerfile index 91c8332aa..4e1f28291 100644 --- a/projects/spidermonkey/Dockerfile +++ b/projects/spidermonkey/Dockerfile @@ -22,6 +22,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \ yasm \ python +# This wrapper of cargo seems to interfere with our build system. +RUN rm -f /usr/local/bin/cargo + RUN git clone --depth=1 https://github.com/mozilla/gecko-dev mozilla-central WORKDIR mozilla-central/js/src/ COPY build.sh $SRC/ |