nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1864624: Support building gkrust in mozilla-central derived projects. r=glandium

Browse source 
Allow overriding the .cargo/config.in source location to permit projects such
as comm-central to provide their own vendor configuration and tree, as well as
conditionally building gkrust.

It is expected in comm-central that we still export and provide a gkrust build
by including the existing `/toolkit/library/rust/moz.build` into our build system,
such that gtest linkage and mozilla-central expectations are correctly met.

Differential Revision: https://phabricator.services.mozilla.com/D193536
This commit is contained in:
Ikey Doherty 2023-11-17 11:31:55 +00:00
parent ddea906438
commit 546384e99d
2 changed files with 5 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
moz.build
View file

@ -183,7 +183,7 @@ if CONFIG["MOZ_BUILD_APP"]:
else:
include("/toolkit/toolkit.mozbuild")
OBJDIR_PP_FILES[".cargo"] += [".cargo/config.in"]
OBJDIR_PP_FILES[".cargo"] += [CONFIG["MOZ_OVERRIDE_CARGO_CONFIG"] or ".cargo/config.in"]
DEFINES["top_srcdir"] = TOPSRCDIR

7
toolkit/toolkit.mozbuild
View file

@ -31,9 +31,10 @@ if CONFIG['ENABLE_TESTS']:
'/toolkit/library/gtest/rust',
]
DIRS += [
'/toolkit/library/rust',
]
if not CONFIG['MOZ_OVERRIDE_GKRUST']:
DIRS += [
'/toolkit/library/rust',
]
if CONFIG['MOZ_SANDBOX']:
DIRS += ['/security/sandbox']