Use older test compiler. Enable s390x testing.

This commit is contained in:
Anthony Green
2019-11-06 06:44:19 -05:00
parent 36d281ab70
commit 0fb9ee21e6
3 changed files with 9 additions and 8 deletions
+4 -2
View File
@@ -7,6 +7,10 @@ matrix:
include: include:
- os: osx - os: osx
env: HOST=arm-apple-darwin env: HOST=arm-apple-darwin
- os: linux
env: HOST=hppa-linux-gnu MEVAL='export CC="hppa-linux-gnu-gcc-7" && CXX="hppa-linux-gnu-g++-7"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/hppa-linux-gnu
- os: linux
env: HOST=s390x-linux-gnu MEVAL='export CC="s390x-linux-gnu-gcc-7" && CXX="s390x-linux-gnu-g++-7"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/s390x-linux-gnu
- os: linux - os: linux
env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0" env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0"
- os: linux - os: linux
@@ -21,8 +25,6 @@ matrix:
env: HOST=powerpc64le-unknown-linux-gnu env: HOST=powerpc64le-unknown-linux-gnu
- os: linux - os: linux
env: HOST=mips64el-linux-gnu env: HOST=mips64el-linux-gnu
- os: linux
env: HOST=hppa-linux-gnu MEVAL='export CC="hppa-linux-gnu-gcc-8" && CXX="hppa-linux-gnu-g++-8"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/hppa-linux-gnu
- os: linux - os: linux
compiler: gcc compiler: gcc
env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"' env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
-4
View File
@@ -56,10 +56,6 @@ case "$HOST" in
aarch64-linux-gnu| powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu) aarch64-linux-gnu| powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu)
build_cfarm build_cfarm
;; ;;
s390x-linux-gnu)
./autogen.sh
build_foreign_linux s390x s390x/ubuntu
;;
*) *)
./autogen.sh ./autogen.sh
build_linux build_linux
+5 -2
View File
@@ -12,11 +12,14 @@ else
case $HOST in case $HOST in
aarch64-linux-gnu | powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu) aarch64-linux-gnu | powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu)
;; ;;
arm32v7-linux-gnu | s390x-linux-gnu) arm32v7-linux-gnu )
sudo apt-get install qemu-user-static sudo apt-get install qemu-user-static
;; ;;
hppa-linux-gnu ) hppa-linux-gnu )
sudo apt-get install qemu-user-static g++-8-hppa-linux-gnu sudo apt-get install -y qemu-user-static g++-7-hppa-linux-gnu
;;
s390x-linux-gnu )
sudo apt-get install -y qemu-user-static g++-7-s390x-linux-gnu
;; ;;
i386-pc-linux-gnu) i386-pc-linux-gnu)
sudo apt-get install gcc-multilib g++-multilib; sudo apt-get install gcc-multilib g++-multilib;