From a0a0cbdb0ca9f8516574aa2cc1f83a3ae9612896 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 28 Jul 2020 07:41:23 +0300
Subject: [PATCH] firefox [testing]: Use patch from upstream

---
 testing/firefox/checksums               |  2 +-
 testing/firefox/patches/rust-1.45.patch | 28 ++++++++++++-------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/testing/firefox/checksums b/testing/firefox/checksums
index 8e197c44..50792512 100644
--- a/testing/firefox/checksums
+++ b/testing/firefox/checksums
@@ -2,4 +2,4 @@
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e  autoconf-2.13.tar.gz
 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f  yasm-1.3.0.tar.gz
 002ea9051c7f6d185c283be2f6606c8589c00925661b22f105e4100656c852e9  no-dbus.patch
-e54579280a7c18401569bb57d4869a753c54024fe54b2108974bced33ceed952  rust-1.45.patch
+675a71dd0659a26db2f8b6665c57da3c481d8b9fb164b227fa8eed465483a42b  rust-1.45.patch
diff --git a/testing/firefox/patches/rust-1.45.patch b/testing/firefox/patches/rust-1.45.patch
index 94ba697a..0f8d7ae6 100644
--- a/testing/firefox/patches/rust-1.45.patch
+++ b/testing/firefox/patches/rust-1.45.patch
@@ -1,12 +1,19 @@
+From cb5b4585486a52d06315a800f9e4ed96f2677898 Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh+mozilla@glandium.org>
+Date: Mon, 20 Jul 2020 16:05:36 +0000
+Subject: [PATCH] Bug 1640982 - Set CARGO_PROFILE_RELEASE_LTO=true when
+ enabling rust LTO. r=firefox-build-system-reviewers,rstewart
+
+Differential Revision: https://phabricator.services.mozilla.com/D84098
+---
+ config/makefiles/rust.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
 diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
+index 82182ffdf30fe..4b4a679593377 100644
 --- a/config/makefiles/rust.mk
 +++ b/config/makefiles/rust.mk
-@@ -56,17 +56,21 @@ endif
- # These flags are passed via `cargo rustc` and only apply to the final rustc
- # invocation (i.e., only the top-level crate, not its dependencies).
- cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
+@@ -61,7 +61,11 @@ ifndef MOZ_DEBUG_RUST
  # Enable link-time optimization for release builds, but not when linking
  # gkrust_gtest.
  ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
@@ -18,12 +25,3 @@ diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
  endif
  endif
  endif
-
- ifdef CARGO_INCREMENTAL
- export CARGO_INCREMENTAL
- endif
-
-
-
-
-