From 629e421d675cae7c75295b8a5f5bcb2b691ed242 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Thu, 10 Mar 2016 09:37:58 +0900 Subject: [PATCH] Updated travis file to properly select gcc-4.7. --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c17ea6e4..454b9298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,14 @@ before_install: - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq - sudo apt-get build-dep rtorrent libtorrent-dev + +if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.7; fi +if [ "$CXX" = "g++" ]; then export CXX="g++-4.7" CC="gcc-4.7"; fi + # prevent `macro `AM_PATH_CPPUNIT' not found in library` in `autogen.sh` - - sudo apt-get install libcppunit-dev gcc-4.7 g++-4.7 -# `autogen.sh` doesn't call `configure` - - export CC=gcc-4.7 && export CXX=g++-4.7 - - git clone https://github.com/rakshasa/libtorrent.git && cd libtorrent && ./autogen.sh && configure && make -j24 && sudo make install && cd .. + - sudo apt-get install libcppunit-dev + + - git clone https://github.com/rakshasa/libtorrent.git && cd libtorrent && ./autogen.sh && configure && make -j12 && sudo make install && cd .. # Figure out how to fix the issue running 'make check'. script: ./autogen.sh && ./configure && make -j12 && sudo make install