Remove gcc 6/7 LTO and -Werror workarounds

The gcc versions in Debian stretch (gcc 6) and experimental (gcc 7)
incorporate the upstream gcc fixes.
This commit is contained in:
Jason Rhinelander 2017-04-03 16:51:14 -04:00
parent e0e2ea3378
commit d994db2da0

View File

@ -120,8 +120,6 @@ before_install:
$PYPY_BINARY -m pip install pytest $PYPY_BINARY -m pip install pytest
elif [ -n "$DOCKER" ]; then elif [ -n "$DOCKER" ]; then
docker pull $DOCKER docker pull $DOCKER
# Disable LTO with gcc until gcc 79296 is fixed:
if [ -n "$GCC" ]; then export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -DPYBIND11_LTO_CXX_FLAGS="; fi
export containerid=$(docker run --detach --tty \ export containerid=$(docker run --detach --tty \
--volume="$PWD":/pybind11 --workdir=/pybind11 \ --volume="$PWD":/pybind11 --workdir=/pybind11 \
@ -131,8 +129,6 @@ before_install:
$DOCKER) $DOCKER)
export SCRIPT_RUN_PREFIX="docker exec --tty $containerid" export SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
$SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done' $SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
# gcc-7 currently generates warnings; some are upstream bugs, so just turn off -Werror for now
if [ "$GCC" = "7" ]; then WERROR=off; fi
else else
if [ "$TRAVIS_OS_NAME" = "linux" ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then
pip install --user --upgrade pip virtualenv pip install --user --upgrade pip virtualenv