Bug 1601704 - Work around sccache/rust confusion about mozglue-static. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 06 Dec 2019 05:08:40 +0000
changeset 567947 b515b0637e5eaf851af4a5aa1f8668c02d1a38ab
parent 567946 321a5b9fd6f4161ecf8748b57dd58728f894211a
child 567948 936a79e9f9de48f20acb4475a92c203cd39804c0
push id12493
push userffxbld-merge
push dateMon, 06 Jan 2020 15:38:57 +0000
treeherdermozilla-beta@63ae456b848d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1601704, 58393
milestone73.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1601704 - Work around sccache/rust confusion about mozglue-static. r=chmanchester See https://github.com/rust-lang/rust/issues/58393#issuecomment-562410696 Differential Revision: https://phabricator.services.mozilla.com/D56129
Cargo.lock
js/src/rust/Cargo.toml
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1726,16 +1726,17 @@ dependencies = [
  "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsrust"
 version = "0.1.0"
 dependencies = [
  "jsrust_shared 0.1.0",
+ "mozglue-static 0.1.0",
 ]
 
 [[package]]
 name = "jsrust_shared"
 version = "0.1.0"
 dependencies = [
  "baldrdash 0.1.0",
  "encoding_c 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/js/src/rust/Cargo.toml
+++ b/js/src/rust/Cargo.toml
@@ -12,8 +12,10 @@ path = "lib.rs"
 cranelift_x86 = ['jsrust_shared/cranelift_x86']
 cranelift_arm32 = ['jsrust_shared/cranelift_arm32']
 cranelift_arm64 = ['jsrust_shared/cranelift_arm64']
 cranelift_none = ['jsrust_shared/cranelift_none']
 simd-accel = ['jsrust_shared/simd-accel']
 
 [dependencies]
 jsrust_shared = { path = "./shared" }
+# Workaround for https://github.com/rust-lang/rust/issues/58393
+mozglue-static = { path = "../../../mozglue/static/rust" }