Skip to content

ci: Move to GCC 5.4 (Xenial default) for prebuilts #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 6 commits into from
May 11, 2017
Merged

ci: Move to GCC 5.4 (Xenial default) for prebuilts #946

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08eadaf
ci: Move to GCC 5.4 (Xenial default) for prebuilts
mattklein123 May 11, 2017
802299f
fix
mattklein123 May 11, 2017
7a0c45c
comment
mattklein123 May 11, 2017
5a49e89
comment
mattklein123 May 11, 2017
f5474b1
comment
mattklein123 May 11, 2017
52fce6b
fix
mattklein123 May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions ci/build_container/build_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +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
add-apt-repository -y ppa:ubuntu-toolchain-r/test
apt-get update
apt-get install -y g++-4.9
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 -
Copy link
Copy Markdown
Contributor

@danielhochman danielhochman May 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could save some time by doing all the repo adding and coalescing the apt-get update

Copy link
Copy Markdown
Member Author

@mattklein123 mattklein123 May 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I tried this, but wget isn't installed by default. Sigh.

apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main"
Expand All @@ -32,9 +26,14 @@ 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
# GCC for everything.
export CC=gcc
export CXX=g++
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
Expand Down