Bug 1323127 - Pass absolute path of DIST to cargo. r=froydnj
authorXidorn Quan <me@upsuper.org>
Tue, 13 Dec 2016 15:38:37 +1100
changeset 325917 d706e2d4abfd8bf02c4cec654a7f590a0794ed1a
parent 325916 403bfd796368e1f3e4a40b7e8b0d0b2c2e392ab5
child 325918 da3b6d9b4ce0933e41d4ffc06a4315bfb4a29b6a
push id31080
push usercbook@mozilla.com
push dateThu, 15 Dec 2016 13:16:19 +0000
treeherdermozilla-central@f14683f7fad5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1323127
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 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.