Bug 1532883 - Add missing configuration for nasm on hazard and plain builds. r=dmajor
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 07 Mar 2019 14:44:32 +0000
changeset 520926 d91c333553e45cf0e9ecdf270fe4da1a84ac2dca
parent 520925 1a0f3a7891f481df308a373b86745e4da0277dd6
child 520927 707ec85ae54c8922796ad4e48e5fffa4b050bd31
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1532883
milestone67.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 1532883 - Add missing configuration for nasm on hazard and plain builds. r=dmajor Differential Revision: https://phabricator.services.mozilla.com/D22451
browser/config/mozconfigs/linux64/plain-opt
js/src/devtools/rootAnalysis/mozconfig.haz
taskcluster/ci/hazard/kind.yml
--- a/browser/config/mozconfigs/linux64/plain-opt
+++ b/browser/config/mozconfigs/linux64/plain-opt
@@ -3,14 +3,15 @@ export LLVM_CONFIG="${TOOLTOOL_DIR}/clan
 
 CARGO="${TOOLTOOL_DIR}/rustc/bin/cargo"
 RUSTC="${TOOLTOOL_DIR}/rustc/bin/rustc"
 RUSTDOC="${TOOLTOOL_DIR}/rustc/bin/rustdoc"
 RUSTFMT="${TOOLTOOL_DIR}/rustc/bin/rustfmt"
 CBINDGEN="${TOOLTOOL_DIR}/cbindgen/cbindgen"
 
 export NODEJS="${TOOLTOOL_DIR}/node/bin/node"
+NASM="${TOOLTOOL_DIR}/nasm/nasm"
 
 CC="${TOOLTOOL_DIR}/clang/bin/clang"
 CXX="${TOOLTOOL_DIR}/clang/bin/clang++"
 
 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/js/src/devtools/rootAnalysis/mozconfig.haz
+++ b/js/src/devtools/rootAnalysis/mozconfig.haz
@@ -39,8 +39,9 @@ ac_add_options --disable-replace-malloc
 # -Wattributes is very verbose due to attributes being ignored on template
 # instantiations. -Wignored-attributes is very verbose due to attributes being
 # ignored on template parameters.
 CFLAGS="$CFLAGS -Wno-attributes -Wno-ignored-attributes"
 CPPFLAGS="$CPPFLAGS -Wno-attributes -Wno-ignored-attributes"
 CXXFLAGS="$CXXFLAGS -Wno-attributes -Wno-ignored-attributes"
 
 NODEJS="$TOOLTOOL_DIR/node/bin/node"
+NASM="$TOOLTOOL_DIR/nasm/nasm"
--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -64,9 +64,10 @@ jobs:
                 cd /builds/worker/checkouts/gecko/taskcluster/scripts/builder
                 && ./build-haz-linux.sh --project browser $HOME/workspace
         toolchains:
             - linux64-clang
             - linux64-gcc-6
             - linux64-gcc-sixgill
             - linux64-rust
             - linux64-cbindgen
+            - linux64-nasm
             - linux64-node