Bug 1449066 - Switch hazard builds to GCC 6. r?build
--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -37,17 +37,17 @@ jobs:
cd /builds/worker/checkouts/gecko/taskcluster/scripts/builder
&& ./build-haz-linux.sh --project shell $HOME/workspace
when:
files-changed:
- js/public/**
- js/src/**
toolchains:
- linux64-clang
- - linux64-gcc-4.9
+ - linux64-gcc-6
- linux64-sixgill
- linux64-rust
linux64-haz/debug:
description: "Browser Hazard Analysis Linux"
index:
product: firefox
job-name: browser-haz-debug
@@ -57,11 +57,11 @@ jobs:
run:
using: hazard
mozconfig: "browser/config/mozconfigs/linux64/hazards"
command: >
cd /builds/worker/checkouts/gecko/taskcluster/scripts/builder
&& ./build-haz-linux.sh --project browser $HOME/workspace
toolchains:
- linux64-clang
- - linux64-gcc-4.9
+ - linux64-gcc-6
- linux64-sixgill
- linux64-rust
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -193,17 +193,17 @@ linux64-sixgill:
run:
using: toolchain-script
script: build-gcc-sixgill-plugin-linux.sh
resources:
- 'build/unix/build-gcc/build-gcc.sh'
- 'taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh'
toolchain-artifact: public/build/sixgill.tar.xz
toolchains:
- - linux64-gcc-4.9
+ - linux64-gcc-6
linux64-llvm-dsymutil:
description: "llvm-dsymutil toolchain build"
treeherder:
kind: build
platform: toolchains/opt
symbol: TL(dsymutil)
tier: 1
--- a/taskcluster/scripts/builder/hazard-analysis.sh
+++ b/taskcluster/scripts/builder/hazard-analysis.sh
@@ -5,16 +5,18 @@
[ -n "$GECKO_DIR" ]
HAZARD_SHELL_OBJDIR=$WORKSPACE/obj-haz-shell
JS_SRCDIR=$GECKO_DIR/js/src
ANALYSIS_SRCDIR=$JS_SRCDIR/devtools/rootAnalysis
export CC="$TOOLTOOL_DIR/gcc/bin/gcc"
export CXX="$TOOLTOOL_DIR/gcc/bin/g++"
+export PATH="$TOOLTOOL_DIR/gcc/bin:$PATH"
+export LD_LIBRARY_PATH="$TOOLTOOL_DIR/gcc/lib64"
PYTHON=python2.7
if ! which $PYTHON; then
PYTHON=python
fi
function check_commit_msg () {
--- a/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
+++ b/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
@@ -80,16 +80,18 @@ build_gmp() {
make install DESTDIR=$root_dir
)
}
build_sixgill() {(
cd $root_dir/sixgill
export CC=$gcc_bindir/gcc
export CXX=$gcc_bindir/g++
+ export PATH="$gcc_bindir:$PATH"
+ export LD_LIBRARY_PATH="${gcc_bindir%/bin}/lib64"
export TARGET_CC=$CC
export CPPFLAGS=-I$gmp_dir/include
export EXTRA_LDFLAGS=-L$gmp_dir/lib
export HOST_CFLAGS=$CPPFLAGS
./release.sh --build-and-package --with-gmp=$gmp_dir
tarball=$(ls -td *-sixgill | head -1)/sixgill.tar.xz
cp $tarball $root_dir/sixgill.tar.xz