Bug 1323127 - Pass absolute path of DIST to cargo. r?froydnj draft
authorXidorn Quan <me@upsuper.org>
Tue, 13 Dec 2016 15:38:37 +1100
changeset 449751 c655845d44eeaa8529dc1449ba505c17e99de977
parent 448847 9bd5c5946ea832f6a23a5afb5eae656fdbd70103
child 539562 3e7e05be7c2d7f251d0dd510ba6b3f1892466523
push id38644
push userxquan@mozilla.com
push dateWed, 14 Dec 2016 23:26:44 +0000
reviewersfroydnj
bugs1323127
milestone53.0a1
Bug 1323127 - Pass absolute path of DIST to cargo. r?froydnj MozReview-Commit-ID: GOK2MSA6imC
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -937,17 +937,17 @@ endif
 # choices, and Cargo only supports two, we choose to enable various
 # optimization levels in our Cargo.toml files all the time, and override the
 # optimization level here, if necessary.  (The Cargo.toml files already
 # specify debug-assertions appropriately for --{disable,enable}-debug.)
 ifndef MOZ_OPTIMIZE
 rustflags_override = RUSTFLAGS='-C opt-level=0'
 endif
 
-CARGO_BUILD = env $(rustflags_override) CARGO_TARGET_DIR=. RUSTC=$(RUSTC) MOZ_DIST=$(DIST) $(CARGO) build $(cargo_build_flags)
+CARGO_BUILD = env $(rustflags_override) CARGO_TARGET_DIR=. RUSTC=$(RUSTC) MOZ_DIST=$(ABS_DIST) $(CARGO) build $(cargo_build_flags)
 
 ifdef RUST_LIBRARY_FILE
 
 ifdef RUST_LIBRARY_FEATURES
 rust_features_flag := --features "$(RUST_LIBRARY_FEATURES)"
 endif
 
 # Assume any system libraries rustc links against are already in the target's LIBS.