diff options
| author | Jack Lloyd <[email protected]> | 2018-12-05 21:46:35 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-12-05 21:46:35 -0500 |
| commit | 68c12b19077205c9c4ff2069072fcd986e0e4c30 (patch) | |
| tree | 2ec88c21507a0b2d6c8647175dd68137aa2917c9 | |
| parent | fcccdaf40ca342743055cf555eff049d5146c90a (diff) | |
| parent | 813c25def569ee5dbb19933162a427d7ab305b8f (diff) | |
Merge GH #1771 Add GCC 4.8 build to Travis
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 4 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 3 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh index 57a137b01..f16eff04c 100755 --- a/src/scripts/ci/setup_travis.sh +++ b/src/scripts/ci/setup_travis.sh @@ -19,6 +19,10 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; 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-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 583eb649f..839d0c0dd 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -28,6 +28,7 @@ env: - BUILD_MODE="cross-arm64" - BUILD_MODE="cross-mips64" - BUILD_MODE="cross-win64" + - BUILD_MODE="gcc4.8" - BUILD_MODE="static" - BUILD_MODE="mini-shared" - BUILD_MODE="bsi" @@ -76,6 +77,8 @@ matrix: env: BUILD_MODE="cross-ppc64" - compiler: clang env: BUILD_MODE="cross-mips64" + - compiler: clang + env: BUILD_MODE="gcc4.8" # No ARM Clang compiler on Linux - os: linux diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 823d2255d..00f20bff4 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -182,6 +182,9 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache, ro else: # Flags specific to native targets + if target == 'gcc4.8': + cc_bin = 'g++-4.8' + if target_os in ['osx', 'linux']: flags += ['--with-bzip2', '--with-sqlite', '--with-zlib'] |