From 0bb8021b86a4dc749a64ec0e40b0de63c379243b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niels=20M=C3=B6ller?= Date: Sat, 30 Sep 2023 21:16:33 +0200 Subject: [PATCH] Change cross prefix to "cross/". --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28e7191a..aa8bf00d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -211,7 +211,7 @@ remote/s390x: image: $CI_REGISTRY/$BUILDENV_CROSS_IMAGE script: - build=$(dpkg-architecture -qDEB_HOST_GNU_TYPE) - - host="${CI_JOB_NAME#cross.}" + - host="${CI_JOB_NAME#cross/}" # Not setting CC_FOR_BUILD paired with qemu-user/binfmt somehow causes # config.guess to detect the target as the build platform and not activate # cross-compile mode, even though --build is given. @@ -230,21 +230,21 @@ remote/s390x: except: - tags -cross.arm-linux-gnueabihf: +cross/arm-linux-gnueabihf: extends: .cross-build -cross.aarch64-linux-gnu: +cross/aarch64-linux-gnu: extends: .cross-build -cross.powerpc64-linux-gnu: +cross/powerpc64-linux-gnu: extends: .cross-build -cross.powerpc64le-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: +cross/s390x-linux-gnu: extends: .cross-build variables: EXTRA_CONFIGURE_ARGS: --disable-assembler -- 2.47.2