[firefox] Fix various build problems (#5456)

* [firefox] Suppress LSan errors during build

* [firefox] Properly ignore CFLAGS/CXXFLAGS

* [firefox] Use the same Rust Nightly version as in Mozilla CI
This commit is contained in:
Christian Holler (:decoder) 2021-03-20 16:34:44 +01:00 committed by GitHub
parent 849965d539
commit de52eac2b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions

View File

@ -42,8 +42,21 @@ FUZZ_TARGETS=(
export MOZ_OBJDIR=$WORK/obj-fuzz
export MOZCONFIG=$SRC/mozconfig.$SANITIZER
# Without this, a host tool used during Rust part of the build will fail
export ASAN_OPTIONS="detect_leaks=0"
# Install remaining dependencies.
export SHELL=/bin/bash
# Firefox might not be buildable on the latest Rust Nightly, so we should try
# to use the same version that we use in our CI.
RUST_NIGHTLY_VERSION=$(sed -n 's/^.*--channel.*\(nightly-[0-9-]*\).*$/\1/p' \
$SRC/mozilla-central/taskcluster/ci/toolchain/rust.yml
)
rustup toolchain install ${RUST_NIGHTLY_VERSION}
rustup default ${RUST_NIGHTLY_VERSION}-x86_64-unknown-linux-gnu
./mach --no-interactive bootstrap --application-choice browser
# Skip patches for now

View File

@ -1,4 +1,7 @@
. $SRC/mozconfig.coverage
ac_add_options --enable-address-sanitizer
mk_add_options CFLAGS= CXXFLAGS=
# Don't use standard CFLAGS/CXXFLAGS provided by oss-fuzz
export CFLAGS=""
export CXXFLAGS=""