Bug 1499196 - Update spidermonkey rust search path to look for rust artifacts rooted in the topobjdir. r=bbouvier
authorChris Manchester <cmanchester@mozilla.com>
Thu, 18 Oct 2018 10:24:28 +0000
changeset 443650 afa1cebbba882b70f4f8952236c4fd6594a3e650
parent 443649 3181c8c9ea42c92dca36445dc985f94fc9d3ce46
child 443651 e1c9e5aec40a2ee8b1b3affddd72618016719018
push id34964
push useraciure@mozilla.com
push dateWed, 31 Oct 2018 05:08:54 +0000
treeherdermozilla-central@1c5ee1a29757 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbouvier
bugs1499196
milestone65.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 1499196 - Update spidermonkey rust search path to look for rust artifacts rooted in the topobjdir. r=bbouvier Differential Revision: https://phabricator.services.mozilla.com/D9040
js/src/build.rs
--- a/js/src/build.rs
+++ b/js/src/build.rs
@@ -85,17 +85,17 @@ fn main() {
 fn maybe_add_spidermonkey_rust_lib() {
     let out_dir = env::var("OUT_DIR")
         .expect("cargo should invoke us with the OUT_DIR env var set");
 
     let mut target_build_dir = path::PathBuf::from(out_dir);
     target_build_dir.push("../../");
 
     let mut build_dir = target_build_dir.display().to_string();
-    build_dir.push_str("mozjs_sys-*/out/js/src/rust/*/debug");
+    build_dir.push_str("mozjs_sys-*/out/*/debug");
 
     let entries = match glob::glob(&build_dir){
         Err(_) => { return; }
         Ok(entries) => entries
     };
 
     for entry in entries {
         if let Ok(path) = entry {