From b13d4e589f745d6d67f650e1fdf1b88b1b506758 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 20 Feb 2025 05:08:22 +0000
Subject: [PATCH] Bug 1945507 - Use FINAL_LIBRARY to link mfbt to mozglue.
 r=firefox-build-system-reviewers,sergesanspaille

The difference it makes is that it makes m mfbt inherit the
LIBRARY_DEFINES from mozglue, which were intended to propagate
there.

Differential Revision: https://phabricator.services.mozilla.com/D238539
---
 mfbt/Utf8.cpp           | 2 ++
 mfbt/moz.build          | 2 ++
 mozglue/build/moz.build | 4 ----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mfbt/Utf8.cpp b/mfbt/Utf8.cpp
index 1a10c7a01168..7cea79449d55 100644
--- a/mfbt/Utf8.cpp
+++ b/mfbt/Utf8.cpp
@@ -4,6 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#define MOZ_PRETEND_NO_JSRUST 1
+
 #include "mozilla/Maybe.h"
 #include "mozilla/TextUtils.h"
 #include "mozilla/Types.h"
diff --git a/mfbt/moz.build b/mfbt/moz.build
index 35891b9bbc68..e2733dc080c0 100644
--- a/mfbt/moz.build
+++ b/mfbt/moz.build
@@ -203,3 +203,5 @@ DEFINES["MOZ_SUPPORT_LEAKCHECKING"] = True
 # but pure_virtual requires mfbt to build and some projects
 # don't use mfbt.
 DIRS += ["../build/pure_virtual"]
+
+FINAL_LIBRARY = "mozglue"
diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
index cf0db255be14..f284a20cb538 100644
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -84,10 +84,6 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"]:
             "zlib",
         ]
 
-USE_LIBS += [
-    "mfbt",
-]
-
 LIBRARY_DEFINES["IMPL_MFBT"] = True
 LIBRARY_DEFINES["MOZ_HAS_MOZGLUE"] = True