From 3332980da8da8164f2ff42c3624e2d6e069fdb96 Mon Sep 17 00:00:00 2001 From: Paul Bone Date: Tue, 22 Apr 2025 01:58:32 +0000 Subject: [PATCH] Bug 1960869 - Fix builds with --project=memory r=glandium * set FINAL_LIBRARY in mfbt and third_party_fmt only when not using --enable-project=memory * include third_party/fmt in memory/app.mozbuild Differential Revision: https://phabricator.services.mozilla.com/D245716 --- memory/app.mozbuild | 1 + mfbt/moz.build | 3 ++- third_party/fmt/moz.build | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/memory/app.mozbuild b/memory/app.mozbuild index fc8d4f8002c7..a4adbd56dbda 100644 --- a/memory/app.mozbuild +++ b/memory/app.mozbuild @@ -13,6 +13,7 @@ EXPORTS.mozilla += [ DIRS += [ "/memory", "/mfbt", + "/third_party/fmt", ] EXPORTS.mozilla += [ diff --git a/mfbt/moz.build b/mfbt/moz.build index 34d0bbcc4f96..11fae2cf4fc7 100644 --- a/mfbt/moz.build +++ b/mfbt/moz.build @@ -199,4 +199,5 @@ DEFINES["MOZ_SUPPORT_LEAKCHECKING"] = True # don't use mfbt. DIRS += ["../build/pure_virtual"] -FINAL_LIBRARY = "mozglue" +if CONFIG["MOZ_BUILD_APP"] != "memory": + FINAL_LIBRARY = "mozglue" diff --git a/third_party/fmt/moz.build b/third_party/fmt/moz.build index b51fbec26ddf..348e60c28465 100644 --- a/third_party/fmt/moz.build +++ b/third_party/fmt/moz.build @@ -4,7 +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/. -FINAL_LIBRARY = "mozglue" +if CONFIG["MOZ_BUILD_APP"] != "memory": + FINAL_LIBRARY = "mozglue" with Files('**'): BUG_COMPONENT = ('Core', 'mozglue')