Bug 1324120 - Ensure mozconfig.rust uses the TOOLTOOL_DIR when available. r=gps
authoraleth <aleth@instantbird.org>
Thu, 22 Dec 2016 13:18:05 +0100
changeset 326887 970701ece1a39f49648632c62b90f65da742db5c
parent 326886 74717635e168385c1e979141d771a74536e1422a
child 326888 4308758265df5aea32e24fc183c58f6b829c19bb
push id85064
push useraleth@instantbird.org
push dateThu, 22 Dec 2016 12:18:40 +0000
treeherdermozilla-inbound@970701ece1a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1324120
milestone53.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 1324120 - Ensure mozconfig.rust uses the TOOLTOOL_DIR when available. r=gps
build/mozconfig.rust
--- a/build/mozconfig.rust
+++ b/build/mozconfig.rust
@@ -1,5 +1,7 @@
 # Options to enable rust in automation builds.
 
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
 # Tell configure to use the tooltool rustc.
-RUSTC="$topsrcdir/rustc/bin/rustc"
-CARGO="$topsrcdir/rustc/bin/cargo"
+RUSTC="$TOOLTOOL_DIR/rustc/bin/rustc"
+CARGO="$TOOLTOOL_DIR/rustc/bin/cargo"