diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-05-06 13:13:04 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-05-06 23:40:31 -0700 |
| commit | 22e8db9deb96d2cd88492adf4047087c9d9d575d (patch) | |
| tree | 9b8a40c3fe93689f3ce1d03431d6a7a447cf6a8a | |
| parent | a55a1f77b6c4270f6c19a74e9aa4c83c3bb04e09 (diff) | |
| download | qemu-22e8db9deb96d2cd88492adf4047087c9d9d575d.zip qemu-22e8db9deb96d2cd88492adf4047087c9d9d575d.tar.gz qemu-22e8db9deb96d2cd88492adf4047087c9d9d575d.tar.bz2 | |
gitlab: Drop --static from s390x linux-user build
The host does not have the correct libraries installed for static pie,
which causes host/guest address space interference for some tests.
There's no real gain from linking statically, so drop it.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml index 2b9e1ff..0a2d2bd 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -2,7 +2,7 @@ # setup by the scripts/ci/setup/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 22.04" -ubuntu-22.04-s390x-all-linux-static: +ubuntu-22.04-s390x-all-linux: extends: .custom_runner_template needs: [] stage: build @@ -15,7 +15,7 @@ ubuntu-22.04-s390x-all-linux-static: script: - mkdir build - cd build - - ../configure --enable-debug --static --disable-system + - ../configure --enable-debug --disable-system || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync check-tcg |