Bug 1601704 - Work around sccache/rust confusion about mozglue-static. libxul part. r=firefox-build-system-reviewers,chmanchester

While it doesn't seem to be happening (yet), the same problem that
happened with jsrust can just as well happen with other leaf staticlib
crates that indirectly use mozglue-static.

Differential Revision: https://phabricator.services.mozilla.com/D56159

--HG--
extra : moz-landing-system : lando

Cargo.lock

@@ -1428,6 +1428,7 @@ name = "gkrust"
 version = "0.1.0"
 dependencies = [
  "gkrust-shared 0.1.0",
+ "mozglue-static 0.1.0",
  "mozilla-central-workspace-hack 0.1.0",
  "stylo_tests 0.0.1",
 ]
@@ -1439,6 +1440,7 @@ dependencies = [
  "bench-collections-gtest 0.1.0",
  "gecko-fuzz-targets 0.1.0",
  "gkrust-shared 0.1.0",
+ "mozglue-static 0.1.0",
  "mp4parse-gtest 0.1.0",
  "nsstring-gtest 0.1.0",
  "xpcom-gtest 0.1.0",

toolkit/library/gtest/rust/Cargo.toml

@@ -39,6 +39,8 @@ nsstring-gtest = { path = "../../../../xpcom/rust/gtest/nsstring" }
 xpcom-gtest = { path = "../../../../xpcom/rust/gtest/xpcom" }
 gkrust-shared = { path = "../../rust/shared" }
 gecko-fuzz-targets = { path = "../../../../tools/fuzzing/rust", optional = true }
+# Workaround for https://github.com/rust-lang/rust/issues/58393
+mozglue-static = { path = "../../../../mozglue/static/rust" }
 
 [lib]
 path = "lib.rs"

toolkit/library/rust/Cargo.toml

@@ -36,6 +36,8 @@ fogotype = ["gkrust-shared/fogotype"]
 [dependencies]
 gkrust-shared = { path = "shared" }
 mozilla-central-workspace-hack = { path = "../../../build/workspace-hack" }
+# Workaround for https://github.com/rust-lang/rust/issues/58393
+mozglue-static = { path = "../../../mozglue/static/rust" }
 
 [dev-dependencies]
 stylo_tests = { path = "../../../servo/ports/geckolib/tests/" }