From 08eadaf3dd70b5ff6706899c9621780b183099c8 Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Thu, 11 May 2017 12:27:11 -0700 Subject: [PATCH 1/6] ci: Move to GCC 5.4 (Xenial default) for prebuilts This is part 1 of a change to switch us over to a GCC 5.4 so that we get a thread safe std::string implementation. Will follow up with another commit with CI and doc changes. --- ci/build_container/build_container.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index 932a4659b0468..81b83b2dee8b3 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -9,9 +9,6 @@ apt-get install -y wget software-properties-common make cmake git python python- apt-get install -y golang # For debugging. apt-get install -y gdb strace -add-apt-repository -y ppa:ubuntu-toolchain-r/test -apt-get update -apt-get install -y g++-4.9 # clang head (currently 5.0) wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main" @@ -32,10 +29,6 @@ pip install virtualenv export GOPATH=/usr/lib/go go get github.com/bazelbuild/buildifier/buildifier -# GCC 4.9 for everything. -export CC=gcc-4.9 -export CXX=g++-4.9 - export THIRDPARTY_DEPS=/tmp export THIRDPARTY_SRC=/thirdparty export THIRDPARTY_BUILD=/thirdparty_build From 802299f8ebcddd511d3b7c266049f572b301cc0b Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Thu, 11 May 2017 12:32:22 -0700 Subject: [PATCH 2/6] fix --- ci/build_container/build_container.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index 81b83b2dee8b3..74fa232eb1300 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -5,10 +5,7 @@ set -e # Setup basic requirements and install them. apt-get update apt-get install -y wget software-properties-common make cmake git python python-pip \ - clang-format-3.6 bc libtool automake zip time -apt-get install -y golang -# For debugging. -apt-get install -y gdb strace + clang-format-3.6 bc libtool automake zip time golang g++ gdb strace # clang head (currently 5.0) wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main" From 7a0c45c35caf6dfeefd2b4696e4cc9e09a6c6f91 Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Thu, 11 May 2017 13:43:41 -0700 Subject: [PATCH 3/6] comment --- ci/build_container/build_container.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index 74fa232eb1300..bbac8dfac8f05 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -26,6 +26,11 @@ pip install virtualenv export GOPATH=/usr/lib/go go get github.com/bazelbuild/buildifier/buildifier +# GCC for everything. +export CC=gcc +export CXX=g++ +g++ --version + export THIRDPARTY_DEPS=/tmp export THIRDPARTY_SRC=/thirdparty export THIRDPARTY_BUILD=/thirdparty_build From 5a49e89ab517f34585efa9c022cc8a531d5b5cfa Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Thu, 11 May 2017 14:07:48 -0700 Subject: [PATCH 4/6] comment --- ci/build_container/build_container.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index bbac8dfac8f05..a0981339f1dbe 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -29,7 +29,10 @@ go get github.com/bazelbuild/buildifier/buildifier # GCC for everything. export CC=gcc export CXX=g++ -g++ --version +if [[ "$(${CXX} --version)" != "hello" ]]; then + echo "Unexpected compiler version: $(${CXX} --version)" + exit 1 +fi export THIRDPARTY_DEPS=/tmp export THIRDPARTY_SRC=/thirdparty From f5474b1e0fd3a4f018b3d2d17af492692731ddc9 Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Thu, 11 May 2017 15:41:21 -0700 Subject: [PATCH 5/6] comment --- ci/build_container/build_container.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index a0981339f1dbe..91e160d992164 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -29,11 +29,13 @@ go get github.com/bazelbuild/buildifier/buildifier # GCC for everything. export CC=gcc export CXX=g++ -if [[ "$(${CXX} --version)" != "hello" ]]; then - echo "Unexpected compiler version: $(${CXX} --version)" +CXX_VERSION="$(${CXX} --version | grep ^g++)" +if [[ "${CXX_VERSION}" != "g++ (Ubuntu 5.4.0-6ubuntu1~16.04.4) 5.4.0 20160609" ]]; then + echo "Unexpected compiler version: ${CXX_VERSION}" exit 1 fi + export THIRDPARTY_DEPS=/tmp export THIRDPARTY_SRC=/thirdparty export THIRDPARTY_BUILD=/thirdparty_build From 52fce6bce0ae9d4b3d29b451f23c938346bf0a86 Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Thu, 11 May 2017 15:42:40 -0700 Subject: [PATCH 6/6] fix --- ci/build_container/build_container.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index 91e160d992164..9a6987c187eb6 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -35,7 +35,6 @@ if [[ "${CXX_VERSION}" != "g++ (Ubuntu 5.4.0-6ubuntu1~16.04.4) 5.4.0 20160609" ] exit 1 fi - export THIRDPARTY_DEPS=/tmp export THIRDPARTY_SRC=/thirdparty export THIRDPARTY_BUILD=/thirdparty_build