Skip to content

Commit

Permalink
Bug 1840008 - Undo bug 1632776. r=firefox-build-system-reviewers,andi
Browse files Browse the repository at this point in the history
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
  • Loading branch information
glandium committed Jun 23, 2023
1 parent 6c9420a commit 16bc411
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions config/makefiles/rust.mk
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,7 @@ target_rust_nonltoable := force-cargo-test-run force-cargo-program-build

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

0 comments on commit 16bc411

Please sign in to comment.