Bug 1457524 followup - Unset RUSTDOC for no-compile environment and add it to mozconfigs.
authorXidorn Quan <me@upsuper.org>
Sat, 05 May 2018 11:04:07 +1000
changeset 473111 a5832837830da61ee3ccd851d068b28a36951b0b
parent 473110 b4ac7ba11da57b93a53df945a1dae2bf21b214d2
child 473112 7a9d7817a640aeec9a48eb37063b6a5c6e7e422b
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1457524
milestone61.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 1457524 followup - Unset RUSTDOC for no-compile environment and add it to mozconfigs.
browser/config/mozconfigs/linux64/plain-opt
browser/config/mozconfigs/win64/plain-opt
build/mozconfig.no-compile
--- a/browser/config/mozconfigs/linux64/plain-opt
+++ b/browser/config/mozconfigs/linux64/plain-opt
@@ -1,11 +1,12 @@
 export TOOLTOOL_DIR="$topsrcdir"
 export LLVM_CONFIG="${TOOLTOOL_DIR}/clang/bin/llvm-config"
 
 CARGO="${TOOLTOOL_DIR}/rustc/bin/cargo"
 RUSTC="${TOOLTOOL_DIR}/rustc/bin/rustc"
+RUSTDOC="${TOOLTOOL_DIR}/rustc/bin/rustdoc"
 
 CC="${TOOLTOOL_DIR}/gcc/bin/gcc"
 CXX="${TOOLTOOL_DIR}/gcc/bin/g++"
 
 mk_add_options "export PATH=${TOOLTOOL_DIR}/gcc/bin:${PATH}"
 mk_add_options "export LD_LIBRARY_PATH=${TOOLTOOL_DIR}/gcc/lib64:${TOOLTOOL_DIR}/gcc/lib32:${TOOLTOOL_DIR}/gcc/lib"
--- a/browser/config/mozconfigs/win64/plain-opt
+++ b/browser/config/mozconfigs/win64/plain-opt
@@ -1,11 +1,12 @@
 TOOLTOOL_DIR=${topsrcdir}
 export MAKECAB=$TOOLTOOL_DIR/makecab.exe
 export LLVM_CONFIG="${TOOLTOOL_DIR}/clang/bin/llvm-config"
 
 RUSTC="${TOOLTOOL_DIR}/rustc/bin/rustc"
 CARGO="${TOOLTOOL_DIR}/rustc/bin/cargo"
+RUSTDOC="${TOOLTOOL_DIR}/rustc/bin/rustdoc"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
--- a/build/mozconfig.no-compile
+++ b/build/mozconfig.no-compile
@@ -8,16 +8,17 @@ NO_CACHE=1
 
 # Override any toolchain defines we've inherited from other mozconfigs.
 unset CC
 unset CXX
 unset HOST_CC
 unset HOST_CXX
 unset RUSTC
 unset CARGO
+unset RUSTDOC
 unset MAKECAB
 unset TOOLCHAIN_PREFIX
 unset BINDGEN_CFLAGS
 unset LLVM_CONFIG
 unset WIN64_LINK
 unset WIN64_LIB
 
 unset MOZ_STDCXX_COMPAT