Bug 1317478 - Use cargo from the rustc package. draft
authorRalph Giles <giles@mozilla.com>
Mon, 14 Nov 2016 13:58:46 -0800
changeset 438688 461085424a3e3cb7d187285b0abf49bb7ff70d0c
parent 438550 71fd23fa0803a548b6e571aa25d0533a06cd0421
child 438689 89ae980e675a56eb1c4305e5fcfb175cc6642756
push id35798
push userbmo:giles@thaumas.net
push dateMon, 14 Nov 2016 23:21:43 +0000
bugs1317478
milestone53.0a1
Bug 1317478 - Use cargo from the rustc package. The stable cargo now has all the features we need; pulling a separate cargo nightly package is unnecessary. MozReview-Commit-ID: FqWvSK0swsQ
build/mozconfig.rust
--- a/build/mozconfig.rust
+++ b/build/mozconfig.rust
@@ -1,10 +1,10 @@
 # Options to enable rust in automation builds.
 
 # Tell configure to use the tooltool rustc.
 # Assume this is compiled with --enable-rpath so we don't
 # have to set LD_LIBRARY_PATH.
 RUSTC="$topsrcdir/rustc/bin/rustc"
-CARGO="$topsrcdir/cargo/bin/cargo"
+CARGO="$topsrcdir/rustc/bin/cargo"
 
 # Enable rust in the build.
 ac_add_options --enable-rust