diff options
Diffstat (limited to 'www/firefox/files/patch-bug1640982')
| -rw-r--r-- | www/firefox/files/patch-bug1640982 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/www/firefox/files/patch-bug1640982 b/www/firefox/files/patch-bug1640982 index dae6ca5fa7b5..15789b617616 100644 --- a/www/firefox/files/patch-bug1640982 +++ b/www/firefox/files/patch-bug1640982 @@ -2,14 +2,18 @@ Unbreak build with Rust 1.45.0 error: options `-C embed-bitcode=no` and `-C lto` are incompatible ---- config/makefiles/rust.mk.orig 2020-05-12 09:36:22 UTC +--- config/makefiles/rust.mk.orig 2020-05-12 09:36:22 UTC + +diff --git config/makefiles/rust.mk config/makefiles/rust.mk +index 75570d3..94ec33f 100644 +--- config/makefiles/rust.mk +++ config/makefiles/rust.mk -@@ -61,7 +61,7 @@ ifndef MOZ_DEBUG_RUST - # Enable link-time optimization for release builds, but not when linking - # gkrust_gtest. +@@ -97,7 +97,7 @@ ifndef rustflags_sancov + # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. + ifndef MOZ_CODE_COVERAGE ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) -cargo_rustc_flags += -Clto +cargo_rustc_flags += endif - endif - endif + # We need -Cembed-bitcode=yes for all crates when using -Clto. + RUSTFLAGS += -Cembed-bitcode=yes |