From cfa12a7e17355e5bf3fc1a0c32c281048cdf49c4 Mon Sep 17 00:00:00 2001 From: Christian Beer Date: Thu, 23 Mar 2017 09:06:55 +0100 Subject: [PATCH] Travis: fix mingw build command and add wrapper The previous command was only working because Travis already exports CC and CXX. This works even if this is not the case. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e50ef70d55..98efb64459 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,7 @@ env: - BOINC_TYPE=apps - BOINC_TYPE=manager - BOINC_TYPE=libs-mingw + - BOINC_TYPE=apps-mingw #- BOINC_TYPE=coverity matrix: @@ -81,4 +82,5 @@ script: - if [[ "${BOINC_TYPE}" == "client" ]]; then ( ./configure --disable-server --disable-manager && make ) fi - if [[ "${BOINC_TYPE}" == "apps" ]]; then ( ./configure --enable-apps --disable-server --disable-client --disable-manager && make ) fi - if [[ "${BOINC_TYPE}" == "manager" ]]; then ( ./build/getWxWidgets.sh && ./configure --disable-server --disable-client --with-wxdir=./build/wxWidgets-3.0.2/buildgtk && make ) fi -- if [[ "${BOINC_TYPE}" == "libs-mingw" ]]; then ( cd lib && CC=/usr/bin/x86_64-w64-mingw32-gcc; CXX=/usr/bin/x86_64-w64-mingw32-g++; make -f Makefile.mingw ) fi +- if [[ "${BOINC_TYPE}" == "libs-mingw" ]]; then ( cd lib && MINGW=x86_64-w64-mingw32 make -f Makefile.mingw ) fi +- if [[ "${BOINC_TYPE}" == "apps-mingw" ]]; then ( cd lib && MINGW=x86_64-w64-mingw32 make -f Makefile.mingw wrapper ) fi