about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2019-12-02 16:38:20 +0100
committervan Hauser <vh@thc.org>2019-12-02 16:38:20 +0100
commitf576c87e3a4dc5d98162a7e25c3928f4dd3859c3 (patch)
tree71881e332d37a41766a9ae124124e6bdaee80513
parentc5e231a711103a960702e25e685ba598297d5f5a (diff)
downloadafl++-f576c87e3a4dc5d98162a7e25c3928f4dd3859c3.tar.gz
further travis tweaking
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 2825727a..1bcb3c9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,14 @@ matrix:
     env: NAME="bionic-amd64" MODERN="yes" GCC="7"
   - os: linux
     dist: xenial
-    env: NAME="xenial-amd64" MODERN="no" GCC="5"
+    env: NAME="xenial-amd64" MODERN="no" GCC="5" EXTRA="libtool-bin"
   - os: linux
     dist: trusty
     env: NAME="trusty-amd64" MODERN="no" GCC="4.8"
   - os: linux
     dist: xenial
     arch: arm64
-    env: NAME="xenial-arm64" MODERN="no" GCC="5" AFL_NO_X86="1" CPU_TARGET="aarch64-softmmu"
+    env: NAME="xenial-arm64" MODERN="no" GCC="5" EXTRA="libtool-bin" AFL_NO_X86="1" CPU_TARGET="aarch64-softmmu"
   - os: osx
     osx_image: xcode11.2
     env: NAME="osx" HOMEBREW_NO_ANALYTICS="1" LINK="http://releases.llvm.org/9.0.0/" NAME="clang+llvm-9.0.0-x86_64-darwin-apple"
@@ -38,7 +38,7 @@ before_install:
   - echo Testing on $NAME
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew install wget ; brew install gcc ; wget "$LINK""$NAME".tar.xz ; pushd /usr/local ; sudo tar xjf "$NAME".tar.xz ; popd ; fi
   - if [ "$MODERN" = "yes" ]; then sudo apt update ; sudo apt upgrade ; sudo apt install -y libtool libtool-bin automake bison libglib2.0 build-essential clang gcc-7 gcc-7-plugin-dev libc++-7-dev ; fi
-  - if [ "$MODERN" = "no" ]; then sudo apt update ; apt-cache search plugin-dev|grep gcc ; sudo apt install -y libtool automake bison libglib2.0 build-essential clang gcc gcc-"$GCC"-plugin-dev libc++-dev ; fi
+  - if [ "$MODERN" = "no" ]; then sudo apt update ; sudo apt install -y libtool $EXTRA automake bison libglib2.0 build-essential clang gcc gcc-"$GCC"-plugin-dev libc++-dev ; fi
 
 script:
   - gcc -v