Bug 1323127 - Pass absolute path of DIST to cargo; r?chmanchester draft
authorXidorn Quan <me@upsuper.org>
Wed, 14 Dec 2016 06:28:27 -0500
changeset 451116 c270f8e0bf88ad6bc993fa8cae0c248e5ac300bc
parent 450025 10ac81fb6185037648c6694889aa030d28a5e8a5
child 451117 92af5bf5e17cc19f8c1b1fb408693a3b454f1818
child 453504 4d0e01f1cd2d3d6bdf79d668dde3feb579831605
push id39051
push userbmo:nfroyd@mozilla.com
push dateMon, 19 Dec 2016 16:55:26 +0000
reviewerschmanchester
bugs1323127
milestone53.0a1
Bug 1323127 - Pass absolute path of DIST to cargo; r?chmanchester MozReview-Commit-ID: 6MuUtZJD2z9
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.