Bug 1368177 - quote {LIB,}CLANG_PATH for cargo; r=rillian
authorNathan Froyd <froydnj@mozilla.com>
Sun, 28 May 2017 17:13:30 -0400
changeset 361074 7660dd818a354f9d47f9eaa333b1a9548fe0bac7
parent 361073 e12fa325e11235635eaa49d553f89b8023e26c98
child 361075 5c78702d43ddccee9527230f59e0e0960b188aef
push id31915
push usercbook@mozilla.com
push dateMon, 29 May 2017 08:23:34 +0000
treeherdermozilla-central@cce4d83d2b99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian
bugs1368177
milestone55.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 1368177 - quote {LIB,}CLANG_PATH for cargo; r=rillian These paths can contain spaces, particularly if they point into ${HOME}/.mozbuild on Windows. If people are bold enough to use the Windows packages from llvm.org, the LLVM packages are installed by default into C:\Program Files\LLVM, so paths from there would contain spaces as well.
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -970,18 +970,18 @@ endif
 #
 #   $(call CARGO_BUILD)
 define CARGO_BUILD
 env $(environment_cleaner) $(rustflags_override) \
 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
 	RUSTC=$(RUSTC) \
 	MOZ_SRC=$(topsrcdir) \
 	MOZ_DIST=$(ABS_DIST) \
-	LIBCLANG_PATH=$(MOZ_LIBCLANG_PATH) \
-	CLANG_PATH=$(MOZ_CLANG_PATH) \
+	LIBCLANG_PATH="$(MOZ_LIBCLANG_PATH)" \
+	CLANG_PATH="$(MOZ_CLANG_PATH)" \
 	PKG_CONFIG_ALLOW_CROSS=1 \
 	RUST_BACKTRACE=1 \
 	MOZ_TOPOBJDIR=$(topobjdir) \
 	$(1) \
 	$(CARGO) build $(cargo_build_flags)
 endef
 
 cargo_linker_env_var := CARGO_TARGET_$(RUST_TARGET_ENV_NAME)_LINKER