From 53fb2ded53b6566010210c0660d0baad8c90f07d Mon Sep 17 00:00:00 2001 From: eagleoflqj Date: Mon, 9 Nov 2020 21:51:55 -0500 Subject: [PATCH] revive travis s390x and fix x86.as test --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c5bde7526..c20c14b8dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,11 +42,11 @@ jobs: name: S390X arch: s390x dist: bionic - env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1" R2_X86AS=x86_64-linux-gnu-as + env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1" R2_X86AS=x86_64-w64-mingw32-as addons: apt: packages: - - gcc-x86-64-linux-gnu + - binutils-mingw-w64-x86-64 # Linux with GCC on ARMv8 (64bit) - if: (branch = master AND type = push) OR head_branch =~ ^arm64-* os: linux @@ -100,11 +100,11 @@ jobs: # Linux with GCC on System Z - os: linux arch: s390x - env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1" R2_X86AS=x86_64-linux-gnu-as + env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1" R2_X86AS=x86_64-w64-mingw32-as addons: apt: packages: - - gcc-x86-64-linux-gnu + - binutils-mingw-w64-x86-64 # Linux with GCC on ARMv8 (64bit) - os: linux arch: arm64