summaryrefslogtreecommitdiff
path: root/tools/ci/jobs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-01 03:24:00 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-01 03:52:06 +0300
commit547fb04145d2ab1e5c68a47b1e673aa352d41da6 (patch)
tree6a9273615b7cf96da6fa3e59337585fd79e7d0cf /tools/ci/jobs
parent3641f656462c27eb34f9aba94bf943c083e054ee (diff)
downloadplus-547fb04145d2ab1e5c68a47b1e673aa352d41da6.tar.gz
plus-547fb04145d2ab1e5c68a47b1e673aa352d41da6.tar.bz2
plus-547fb04145d2ab1e5c68a47b1e673aa352d41da6.tar.xz
plus-547fb04145d2ab1e5c68a47b1e673aa352d41da6.zip
Use mxe with gcc-6 for mxe builds.
Diffstat (limited to 'tools/ci/jobs')
-rwxr-xr-xtools/ci/jobs/mxe_gcc5.sh2
-rwxr-xr-xtools/ci/jobs/mxe_gcc6.sh20
-rwxr-xr-xtools/ci/jobs/mxe_gcc6_tests.sh17
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