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 500768 98fad0b05551284eae4d2079123b5555d07dbc4d
parent 500767 470e06d78a7b1da0aea4fd58b520090097de6e19
child 500769 caaad097961a2566dff3742bf57b36085ce3bab6
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbouvier
bugs1499196
milestone64.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 {