From: Niels Möller Date: Sat, 30 Sep 2023 18:47:07 +0000 (+0200) Subject: Disable assembly code for s390x cross build. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3822f57eb773d94ef52354f6c0e28147605114a7;p=thirdparty%2Fnettle.git Disable assembly code for s390x cross build. --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9e2a6fd..28e7191a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -220,7 +220,7 @@ remote/s390x: # Disable C++, to not depend on cross g++. - export CXX=/bin/false - ./.bootstrap - - ./configure --disable-documentation --build=$build --host=$host + - ./configure --disable-documentation $EXTRA_CONFIGURE_ARGS --build=$build --host=$host - make -j$(nproc) - NETTLE_TEST_SEED=0 make -j$(nproc) check - NETTLE_TEST_SEED=0 make -j$(nproc) check-fat @@ -242,5 +242,9 @@ cross.powerpc64-linux-gnu: cross.powerpc64le-linux-gnu: extends: .cross-build +# Disable assembly files, because current qemu doesn't support all +# needed instructions. cross.s390x-linux-gnu: extends: .cross-build + variables: + EXTRA_CONFIGURE_ARGS: --disable-assembler