Bug 1324607 - Use TOOLTOOL_DIR to set the right build path for rustc. r+=RattyAway
authorEdmund Wong <ewong@pw-wspx.org>
Fri, 23 Dec 2016 13:44:51 +0800
changeset 27215 399ddd339faa4bd3157a3836af6af921d579f4ee
parent 27214 9a56d29f240d0b880799af2c023473fcc6f72fbb
child 27216 8dbc018bf883191d7e851417d6e664483fc7d90c
push id1878
push userclokep@gmail.com
push dateTue, 07 Mar 2017 14:18:40 +0000
treeherdercomm-beta@ab59ffd05575 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1324607
Bug 1324607 - Use TOOLTOOL_DIR to set the right build path for rustc. r+=RattyAway
build/mozconfig.rust
--- a/build/mozconfig.rust
+++ b/build/mozconfig.rust
@@ -1,5 +1,7 @@
 # Options to enable rust in automation builds.
 
 # Tell configure to use the tooltool rustc.
-RUSTC="$topsrcdir/rustc/bin/rustc"
-CARGO="$topsrcdir/rustc/bin/cargo"
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+RUSTC="${TOOLTOOL_DIR}/rustc/bin/rustc"
+CARGO="${TOOLTOOL_DIR}/rustc/bin/cargo"