From 597a256957a13fc68e2c43a834e5f0733f641389 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Anders=20Bj=C3=B6rklund?= Date: Fri, 4 Mar 2016 12:36:06 +0100 Subject: [PATCH] Use the standard MinGW for Ubuntu 12.04 LTS Seems like Travis is using precise, use default version. Leaving the Ubuntu 14.04 LTS config, in the git history. Fix the YAML syntax so that is actually runs it, too. Apparently it just "overwrote" it with the ASan build. --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f920b88d..1c5d0d996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ addons: packages: - elfutils - zlib1g-dev - - gcc-mingw-w64-i686 - - binutils-mingw-w64-i686 + - mingw32 + - mingw32-binutils os: - linux @@ -19,9 +19,8 @@ compiler: matrix: include: - os: linux - compiler: gcc - env: HOST="--host=i686-w64-mingw32" TEST="test/main.exe" - include: + compiler: i586-mingw32msvc-gcc + env: HOST="--host=i586-mingw32msvc" TEST="test/main.exe" - os: linux compiler: clang env: CFLAGS="-fsanitize=address -g" ASAN_OPTIONS="detect_leaks=0" -- 2.47.2