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
mozilla-spidermonkey · Dec 7, 2019 · 25799f5 · 25799f5
1 parent e1acea1
commit 25799f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/toolkit/library/gtest/rust/Cargo.toml b/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"

diff --git a/toolkit/library/rust/Cargo.toml b/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/" }