Bug 1449066 - Switch hazard builds to GCC 6, r=froydnj

--HG--
extra : rebase_source : 312938733bbf76c3c9c2fc2ec35ba0b88e6f89de
This commit is contained in:
Steve Fink 2018-03-28 18:15:51 -07:00
Родитель a19aa979c7
Коммит b1be1f1ac9
4 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -42,7 +42,7 @@ jobs:
- js/src/** - js/src/**
toolchains: toolchains:
- linux64-clang - linux64-clang
- linux64-gcc-4.9 - linux64-gcc-6
- linux64-sixgill - linux64-sixgill
- linux64-rust - linux64-rust
@ -62,6 +62,6 @@ jobs:
&& ./build-haz-linux.sh --project browser $HOME/workspace && ./build-haz-linux.sh --project browser $HOME/workspace
toolchains: toolchains:
- linux64-clang - linux64-clang
- linux64-gcc-4.9 - linux64-gcc-6
- linux64-sixgill - linux64-sixgill
- linux64-rust - linux64-rust

Просмотреть файл

@ -198,7 +198,7 @@ linux64-sixgill:
- 'taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh' - 'taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh'
toolchain-artifact: public/build/sixgill.tar.xz toolchain-artifact: public/build/sixgill.tar.xz
toolchains: toolchains:
- linux64-gcc-4.9 - linux64-gcc-6
linux64-llvm-dsymutil: linux64-llvm-dsymutil:
description: "llvm-dsymutil toolchain build" description: "llvm-dsymutil toolchain build"

Просмотреть файл

@ -10,6 +10,8 @@ ANALYSIS_SRCDIR=$JS_SRCDIR/devtools/rootAnalysis
export CC="$TOOLTOOL_DIR/gcc/bin/gcc" export CC="$TOOLTOOL_DIR/gcc/bin/gcc"
export CXX="$TOOLTOOL_DIR/gcc/bin/g++" 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 PYTHON=python2.7
if ! which $PYTHON; then if ! which $PYTHON; then

Просмотреть файл

@ -85,6 +85,8 @@ build_sixgill() {(
cd $root_dir/sixgill cd $root_dir/sixgill
export CC=$gcc_bindir/gcc export CC=$gcc_bindir/gcc
export CXX=$gcc_bindir/g++ export CXX=$gcc_bindir/g++
export PATH="$gcc_bindir:$PATH"
export LD_LIBRARY_PATH="${gcc_bindir%/bin}/lib64"
export TARGET_CC=$CC export TARGET_CC=$CC
export CPPFLAGS=-I$gmp_dir/include export CPPFLAGS=-I$gmp_dir/include
export EXTRA_LDFLAGS=-L$gmp_dir/lib export EXTRA_LDFLAGS=-L$gmp_dir/lib