diff options
| author | Jack Lloyd <[email protected]> | 2018-12-09 12:16:19 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-12-09 12:16:19 -0500 |
| commit | 6eaf690673e6cd929a91cf9ec155ec30556a5cc5 (patch) | |
| tree | e0939695a0dbb34b609275699a5a3cd36f4dcf05 /src | |
| parent | 72301413035187a998f6c19530aa884222dc8023 (diff) | |
| parent | 30698817d787adde42256e32dde0f32c082cd739 (diff) | |
Merge GH #1782 Add an i386 build/test to CI
Diffstat (limited to 'src')
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 12 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 3 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 3 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh index f16eff04c..46292cbb6 100755 --- a/src/scripts/ci/setup_travis.sh +++ b/src/scripts/ci/setup_travis.sh @@ -15,14 +15,18 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update sudo apt-get install valgrind - elif [ "$BUILD_MODE" = "cross-win64" ]; then - sudo apt-get -qq update - sudo apt-get install wine g++-mingw-w64-x86-64 - elif [ "$BUILD_MODE" = "gcc4.8" ]; then sudo apt-get -qq update sudo apt-get install g++-4.8 + elif [ "$BUILD_MODE" = "cross-i386" ]; then + sudo apt-get -qq update + sudo apt-get install g++-multilib linux-libc-dev libc6-dev-i386 + + elif [ "$BUILD_MODE" = "cross-win64" ]; then + sudo apt-get -qq update + sudo apt-get install wine g++-mingw-w64-x86-64 + elif [ "$BUILD_MODE" = "cross-arm32" ]; then sudo apt-get -qq update sudo apt-get install qemu-user g++-arm-linux-gnueabihf diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml index 839d0c0dd..f93987b26 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -22,6 +22,7 @@ env: - BUILD_MODE="fuzzers" - BUILD_MODE="coverage" - BUILD_MODE="valgrind" + - BUILD_MODE="cross-i386" - BUILD_MODE="cross-ppc32" - BUILD_MODE="cross-ppc64" - BUILD_MODE="cross-arm32" @@ -78,6 +79,8 @@ matrix: - compiler: clang env: BUILD_MODE="cross-mips64" - compiler: clang + env: BUILD_MODE="cross-i386" + - compiler: clang env: BUILD_MODE="gcc4.8" # No ARM Clang compiler on Linux diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 00f20bff4..8c899e63d 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -146,6 +146,9 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache, ro flags += ['--cpu=arm64', '--cc-abi-flags=-arch arm64 -stdlib=libc++'] else: raise Exception("Unknown cross target '%s' for iOS" % (target)) + elif target == 'cross-i386': + flags += ['--cpu=x86_32'] + elif target == 'cross-win64': # MinGW in 16.04 is lacking std::mutex for unknown reason cc_bin = 'x86_64-w64-mingw32-g++' |