aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSilvio Traversaro <silvio@traversaro.it>2020-12-13 01:29:18 +0100
committerGitHub <noreply@github.com>2020-12-13 01:29:18 +0100
commit5f1c91499486c97bcd176102549a03564a33a129 (patch)
treec06d4054e11fd6b7ec26656ccf4c929c13f89b57 /tools
parent008df693cf5a71b8f1db87731a7b5af87400e5dd (diff)
parent22020637d7a59dbc983f3e2751f71acf19891802 (diff)
downloaddlfcn-win32-5f1c91499486c97bcd176102549a03564a33a129.tar.gz
dlfcn-win32-5f1c91499486c97bcd176102549a03564a33a129.tar.bz2
dlfcn-win32-5f1c91499486c97bcd176102549a03564a33a129.zip
Merge pull request #88 from pali/master
Run Travis tests also under i586-mingw32msvc-gcc compiler
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ci-build.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index a7d79b1..366a407 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -11,8 +11,6 @@ set -x
11# target to build for 11# target to build for
12: "${ci_target:=${CROSS_COMPILE%-}}" 12: "${ci_target:=${CROSS_COMPILE%-}}"
13 13
14install_prefix=$(${ci_target}-gcc --print-sysroot)/${ci_target}
15
16case "$ci_buildsys" in 14case "$ci_buildsys" in
17 (Makefile) 15 (Makefile)
18 ./configure --enable-shared --enable-static --enable-wine --cross-prefix=${ci_target}- 16 ./configure --enable-shared --enable-static --enable-wine --cross-prefix=${ci_target}-
@@ -27,7 +25,7 @@ case "$ci_buildsys" in
27 cd build 25 cd build
28 cmake \ 26 cmake \
29 --no-warn-unused-cli \ 27 --no-warn-unused-cli \
30 -DCMAKE_FIND_ROOT_PATH=$install_prefix \ 28 -DCMAKE_FIND_ROOT_PATH=$(${ci_target}-gcc --print-sysroot)/${ci_target} \
31 -DCMAKE_BUILD_TYPE=RelWithDebInfo \ 29 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
32 -DCMAKE_C_COMPILER=$(which ${ci_target}-gcc) \ 30 -DCMAKE_C_COMPILER=$(which ${ci_target}-gcc) \
33 -DCMAKE_SYSTEM_PROCESSOR=${ci_target%-*-*} \ 31 -DCMAKE_SYSTEM_PROCESSOR=${ci_target%-*-*} \