From b1be1f1ac957e0d42c21a09a34fec6fb38cf9b9c Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Wed, 28 Mar 2018 18:15:51 -0700
Subject: [PATCH] Bug 1449066 - Switch hazard builds to GCC 6, r=froydnj

--HG--
extra : rebase_source : 312938733bbf76c3c9c2fc2ec35ba0b88e6f89de
---
 taskcluster/ci/hazard/kind.yml                             | 4 ++--
 taskcluster/ci/toolchain/linux.yml                         | 2 +-
 taskcluster/scripts/builder/hazard-analysis.sh             | 2 ++
 taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/taskcluster/ci/hazard/kind.yml b/taskcluster/ci/hazard/kind.yml
index d272621709d1..2b9c12373d75 100644
--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -42,7 +42,7 @@ jobs:
                 - js/src/**
         toolchains:
             - linux64-clang
-            - linux64-gcc-4.9
+            - linux64-gcc-6
             - linux64-sixgill
             - linux64-rust
 
@@ -62,6 +62,6 @@ jobs:
                 && ./build-haz-linux.sh --project browser $HOME/workspace
         toolchains:
             - linux64-clang
-            - linux64-gcc-4.9
+            - linux64-gcc-6
             - linux64-sixgill
             - linux64-rust
diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml
index 6982f2f19b2e..e4892505ad3c 100755
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -198,7 +198,7 @@ linux64-sixgill:
             - '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"
diff --git a/taskcluster/scripts/builder/hazard-analysis.sh b/taskcluster/scripts/builder/hazard-analysis.sh
index 4bdd30d03f00..29dcf7b1f798 100755
--- a/taskcluster/scripts/builder/hazard-analysis.sh
+++ b/taskcluster/scripts/builder/hazard-analysis.sh
@@ -10,6 +10,8 @@ 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
diff --git a/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh b/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
index 9f97b3decc49..16ae5e19161a 100755
--- a/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
+++ b/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
@@ -85,6 +85,8 @@ 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