1936607 - `mach cargo` hardcodes m-c crate paths

Status: RESOLVED FIXED

(Thunderbird :: Build Config, task)

Description

[Sean Burke [:leftmostcat]]

mach cargo cannot currently be used when mozbuild is configured for comm, as mach cargo hardcodes a list of crates to use as the roots of analysis (https://searchfox.org/mozilla-central/source/python/mozbuild/mozbuild/mach_commands.py#270). These paths are specific to m-c. They are relative to objdir; replacing them with the relative /comm paths to our gkrust and gtest crates results in mach cargo succeeding.

Comment 1

[Sean Burke [:leftmostcat]]

For reference, the following are the changes I have in my local copy:

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -268,8 +268,8 @@ def cargo(
 
     # XXX duplication with `mach vendor rust`
     crates_and_roots = {
-        "gkrust": {"directory": "toolkit/library/rust", "library": True},
-        "gkrust-gtest": {"directory": "toolkit/library/gtest/rust", "library": True},
+        "gkrust": {"directory": "comm/rust/gkrust", "library": True},
+        "gkrust-gtest": {"directory": "comm/rust/gtest", "library": True},
         "geckodriver": {"directory": "testing/geckodriver", "library": False},
     }

Obviously this isn't suitable for merging, but provides an idea of what's needed. :)

Comment 2

[Brendan Abolivier [:babolivier]]

Attachment: Bug 1936607 - Use comm-central's gkrust in Cargo commands when building Thunderbird. r=#firefox-build-system-reviewers

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/ff4d838b3761
Use comm-central's gkrust in Cargo commands when building Thunderbird. r=firefox-build-system-reviewers,glandium

Comment 4

[Atila Butkovits]

https://hg.mozilla.org/mozilla-central/rev/ff4d838b3761