corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1945507 - Use FINAL_LIBRARY to link mfbt to mozglue. r=firefox-build-system-reviewers,sergesanspaille

Browse Source 
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
This commit is contained in:
Mike Hommey
2025-02-20 05:08:22 +00:00
parent 187ba0c3f7
commit b13d4e589f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mfbt/Utf8.cpp
View File

@@ -4,6 +4,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#define MOZ_PRETEND_NO_JSRUST 1
#include "mozilla/Maybe.h" #include "mozilla/Maybe.h"
#include "mozilla/TextUtils.h" #include "mozilla/TextUtils.h"
#include "mozilla/Types.h" #include "mozilla/Types.h"

2
mfbt/moz.build
View File

@@ -203,3 +203,5 @@ DEFINES["MOZ_SUPPORT_LEAKCHECKING"] = True
# but pure_virtual requires mfbt to build and some projects # but pure_virtual requires mfbt to build and some projects
# don't use mfbt. # don't use mfbt.
DIRS += ["../build/pure_virtual"] DIRS += ["../build/pure_virtual"]
FINAL_LIBRARY = "mozglue"

4
mozglue/build/moz.build
View File

@@ -84,10 +84,6 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"]:
"zlib", "zlib",
] ]
USE_LIBS += [
"mfbt",
]
LIBRARY_DEFINES["IMPL_MFBT"] = True LIBRARY_DEFINES["IMPL_MFBT"] = True
LIBRARY_DEFINES["MOZ_HAS_MOZGLUE"] = True LIBRARY_DEFINES["MOZ_HAS_MOZGLUE"] = True