diff options
| author |  Abhishek Arya <inferno@chromium.org> | 2018-07-26 10:23:07 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-26 10:23:07 -0700 |
| commit | e6a7d03c61bbebed103d30f8d0a3456c12225bf0 (patch) | |
| tree | 5d41229cba9d787b0ce80af8c2ef6faecdac5397 /projects/firefox | |
| parent | 704da2ddac5e429955ceb278dfeebb455d888eb7 (diff) | |
Speculative fix for firefox build failure. (#1658)
Diffstat (limited to 'projects/firefox')
| -rw-r--r-- | projects/firefox/Dockerfile | 1 | ||||
| -rwxr-xr-x | projects/firefox/build.sh | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/projects/firefox/Dockerfile b/projects/firefox/Dockerfile index 690f5ca7..d7eac00a 100644 --- a/projects/firefox/Dockerfile +++ b/projects/firefox/Dockerfile @@ -22,5 +22,4 @@ RUN apt-get update && \ RUN hg clone https://hg.mozilla.org/mozilla-central WORKDIR mozilla-central ENV SHELL /bin/bash # required by mach for some reason -RUN ./mach bootstrap --no-interactive --application-choice browser COPY build.sh target.c $SRC/ diff --git a/projects/firefox/build.sh b/projects/firefox/build.sh index ea0a5094..e7f9df2c 100755 --- a/projects/firefox/build.sh +++ b/projects/firefox/build.sh @@ -47,6 +47,9 @@ ac_add_options --enable-address-sanitizer EOF fi +# Install dependencies. +./mach bootstrap --no-interactive --application-choice browser + source /root/.cargo/env # Build! Takes about 15 minutes on a 32 vCPU instance. @@ -62,7 +65,7 @@ mv $OBJDIR/toolkit/library/gtest/libxul.so $OUT/firefox mv $OUT/firefox/dependentlibs.list $OUT/firefox/dependentlibs.list.gtest # Get the absolute paths of the required libraries. -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OUT/firefox +export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:$OUT/firefox REQUIRED_LIBRARIES=($(ldd $OUT/firefox/libxul.so | gawk '/=> [/]/ {print $3}')) REQUIRED_LIBRARIES=(${REQUIRED_LIBRARIES[@]##$OUT/*}) |