From ca914b8b1ff13e4e55ed7f990945fb8fc4a10cc1 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Mon, 10 Oct 2016 18:03:25 +0200 Subject: [PATCH] Use newest bintools with gcc 6, thanks @oxidase --- .travis.yml | 2 +- scripts/travis/before_install.x86_64-asan.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 scripts/travis/before_install.x86_64-asan.sh diff --git a/.travis.yml b/.travis.yml index 8bcb98e88..a0841b6f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] - env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' COVERAGE=ON + env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' COVERAGE=ON - os: linux compiler: "clang-3.8-debug" diff --git a/scripts/travis/before_install.x86_64-asan.sh b/scripts/travis/before_install.x86_64-asan.sh new file mode 100644 index 000000000..20f603b85 --- /dev/null +++ b/scripts/travis/before_install.x86_64-asan.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +sudo add-apt-repository ppa:jonathonf/binutils --yes || true +sudo apt-get update -qq --yes || true +sudo apt-get install -qq --yes --force-yes binutils