Skip to content

Commit 16bc411

Browse files
committed
Bug 1840008 - Undo bug 1632776. r=firefox-build-system-reviewers,andi
The bug it worked around (rust-lang/rust#61002) was fixed in rustc 1.55, and we currently require 1.66. Differential Revision: https://phabricator.services.mozilla.com/D181843
1 parent 6c9420a commit 16bc411

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

config/makefiles/rust.mk

+1-6
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,7 @@ target_rust_nonltoable := force-cargo-test-run force-cargo-program-build
259259

260260
ifdef MOZ_PGO_RUST
261261
ifdef MOZ_PROFILE_GENERATE
262-
# Our top-level Cargo.toml sets panic to abort, so we technically don't need -C panic=abort,
263-
# but the autocfg crate takes RUSTFLAGS verbatim and runs its compiler tests without
264-
# -C panic=abort (because it doesn't know it's what cargo uses), which fail on Windows
265-
# because -C panic=unwind (the compiler default) is not compatible with -C profile-generate
266-
# (https://github.com/rust-lang/rust/issues/61002).
267-
rust_pgo_flags := -C panic=abort -C profile-generate=$(topobjdir)
262+
rust_pgo_flags := -C profile-generate=$(topobjdir)
268263
ifeq (1,$(words $(filter 5.% 6.% 7.% 8.% 9.% 10.% 11.%,$(CC_VERSION) $(RUSTC_LLVM_VERSION))))
269264
# Disable value profiling when:
270265
# (RUSTC_LLVM_VERSION < 12 and CC_VERSION >= 12) or (RUSTC_LLVM_VERSION >= 12 and CC_VERSION < 12)

0 commit comments

Comments
 (0)