From da0c697963816e9e3df0afc439a40ba1fadfe2a6 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 4 Dec 2017 11:15:03 +0000 Subject: [PATCH] Compile using gcc-5 on native ubuntu. As dependencies prepared by kiwix-build are build using gcc-5 (kiwix/kiwix-build@7fc557d), we need to also compile libzim using gcc-5. --- .travis.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76ec542..50be780 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,22 @@ language: cpp dist: trusty sudo: required cache: ccache +before_install: +- eval "${MATRIX_EVAL}" +- ${CXX} --version install: travis/install_deps.sh script: travis/compile.sh env: -- PLATFORM="native_static" -- PLATFORM="native_dyn" -- PLATFORM="win32_static" -- PLATFORM="win32_dyn" + global: + - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" + matrix: + - PLATFORM="native_static" + - PLATFORM="native_dyn" + - PLATFORM="win32_static" + - PLATFORM="win32_dyn" +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5