Use mxe with gcc-6 for mxe builds.

3 files changed, 38 insertions, 1 deletions

diff --git a/tools/ci/jobs/mxe_gcc5.sh b/tools/ci/jobs/mxe_gcc5.sh
index e9ae0d97b..da3cb678a 100755
--- a/tools/ci/jobs/mxe_gcc5.sh
+++ b/tools/ci/jobs/mxe_gcc5.sh
@@ -3,7 +3,7 @@
 export LOGFILE=mxe_gcc5.log
 
 source ./tools/ci/scripts/winvars.sh || exit 1
-source ./build/mingw5flags.sh || exit 1
+source ./tools/ci/flags/mingw5.sh || exit 1
 
 $CC --version
 $CXX --version
diff --git a/tools/ci/jobs/mxe_gcc6.sh b/tools/ci/jobs/mxe_gcc6.sh
new file mode 100755
index 000000000..7aa6d1e83
--- /dev/null
+++ b/tools/ci/jobs/mxe_gcc6.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+export LOGFILE=mxe_gcc6.log
+
+source ./tools/ci/scripts/winvars.sh || exit 1
+source ./tools/ci/flags/mingw6.sh || exit 1
+
+$CC --version
+$CXX --version
+
+echo env
+env
+
+autoreconf -i || exit 1
+
+./configure \
+--host=${CROSS} \
+--enable-werror || (cp config.log logs || exit 1)
+
+make -j2 V=0
diff --git a/tools/ci/jobs/mxe_gcc6_tests.sh b/tools/ci/jobs/mxe_gcc6_tests.sh
new file mode 100755
index 000000000..81548bad2
--- /dev/null
+++ b/tools/ci/jobs/mxe_gcc6_tests.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+export LOGFILE=mxe_gcc6.log
+
+source ./tools/ci/scripts/winvars.sh || exit 1
+
+$CC --version
+$CXX --version
+
+autoreconf -i || exit 1
+
+./configure \
+--host=${CROSS} \
+--enable-unittestsbin \
+$* || (cp config.log logs || exit 1)
+
+make -j2 V=0