Bug 1656813 - Make swgl a dependency of gkrust so that we have correc…

…t dependencies for sccache. r=glandium See rust-lang/rust#58393 Differential Revision: https://phabricator.services.mozilla.com/D85713
mozilla · Aug 5, 2020 · e23caa3 · e23caa3
1 parent 8968a8c
commit e23caa3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 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
@@ -43,8 +43,10 @@ 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
+
+# Workarounds for https://github.com/rust-lang/rust/issues/58393
 mozglue-static = { path = "../../../../mozglue/static/rust" }
+swgl = { path = "../../../../gfx/wr/swgl" }
 
 [lib]
 path = "lib.rs"

diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml
@@ -40,8 +40,10 @@ with_dbus = ["gkrust-shared/with_dbus"]
 [dependencies]
 gkrust-shared = { path = "shared" }
 mozilla-central-workspace-hack = { path = "../../../build/workspace-hack" }
-# Workaround for https://github.com/rust-lang/rust/issues/58393
+
+# Workarounds for https://github.com/rust-lang/rust/issues/58393
 mozglue-static = { path = "../../../mozglue/static/rust" }
+swgl = { path = "../../../gfx/wr/swgl" }
 
 [dev-dependencies]
 stylo_tests = { path = "../../../servo/ports/geckolib/tests/" }