Skip to content

Commit ed5f14e

Browse files
committed
Bug 1635158 - Change rustc option -Zno-landing-pads to -Cpanic=abort for ccov builds r=marco
The option -Zno-landing-pads has been removed from rustc (see rust-lang/rust#70175). So replace it with '-Cpanic=abort -Zpanic_abort_tests'. Differential Revision: https://phabricator.services.mozilla.com/D74028
1 parent 9138e3b commit ed5f14e

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

browser/config/mozconfigs/linux64/code-coverage

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ ac_add_options --enable-coverage
1313
CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/* && cd lib/linux && pwd)"
1414
export LDFLAGS="--coverage -L$CLANG_LIB_DIR"
1515
export LIBS="-lclang_rt.profile-x86_64"
16-
export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Zno-landing-pads -Clink-dead-code -Coverflow-checks=off"
16+
export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Cpanic=abort -Zpanic_abort_tests -Clink-dead-code -Coverflow-checks=off"
17+
export RUSTDOCFLAGS="-Cpanic=abort"

browser/config/mozconfigs/macosx64/code-coverage

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ ac_add_options --enable-coverage
1010
CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/* && cd lib/darwin && pwd)"
1111
export LDFLAGS="-coverage -L$CLANG_LIB_DIR"
1212
export LIBS="-lclang_rt.profile_osx"
13-
export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Zno-landing-pads -Clink-dead-code -Coverflow-checks=off"
13+
export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Cpanic=abort -Zpanic_abort_tests -Clink-dead-code -Coverflow-checks=off"
14+
export RUSTDOCFLAGS="-Cpanic=abort"

browser/config/mozconfigs/win64/code-coverage

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ if [ -d "$MOZ_FETCHES_DIR/clang" ]; then
2222
export LDFLAGS="clang_rt.profile-x86_64.lib"
2323
fi
2424

25-
export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Zno-landing-pads -Clink-dead-code -Coverflow-checks=off"
25+
export RUSTFLAGS="-Ccodegen-units=1 -Zprofile -Cpanic=abort -Zpanic_abort_tests -Clink-dead-code -Coverflow-checks=off"
26+
export RUSTDOCFLAGS="-Cpanic=abort"
2627

2728
. "$topsrcdir/build/mozconfig.clang-cl"
2829
. "$topsrcdir/build/mozconfig.common.override"

0 commit comments

Comments
 (0)