diff options
| author | Thomas Huth | 2022-05-16 16:58:23 +0200 |
|---|---|---|
| committer | Thomas Huth | 2022-05-18 08:54:22 +0200 |
| commit | 83602083b4ada6ceb86bfb327e83556ebab120fc (patch) | |
| tree | 8b29a67b527332db99e375a4c8152c62e4055e85 /.gitlab-ci.d/windows.yml | |
| parent | capstone: Allow version 3.0.5 again (diff) | |
| download | qemu-83602083b4ada6ceb86bfb327e83556ebab120fc.tar.gz qemu-83602083b4ada6ceb86bfb327e83556ebab120fc.tar.xz qemu-83602083b4ada6ceb86bfb327e83556ebab120fc.zip | |
capstone: Remove the capstone submodule
Now that we allow compiling with Capstone v3.0.5 again, all our supported
build hosts should provide at least this version of the disassembler
library, so we do not need to ship this as a submodule anymore.
Message-Id: <20220516145823.148450-4-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to '.gitlab-ci.d/windows.yml')
| -rw-r--r-- | .gitlab-ci.d/windows.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 47f6073773..cf7724b8e5 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -57,7 +57,7 @@ msys2-64bit: - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - $env:MSYSTEM = 'MINGW64' # Start a 64 bit Mingw environment - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu - --enable-capstone=system --without-default-devices' + --enable-capstone --without-default-devices' - .\msys64\usr\bin\bash -lc "sed -i '/^ROMS=/d' build/config-host.mak" - .\msys64\usr\bin\bash -lc 'make -j2' - .\msys64\usr\bin\bash -lc 'make check' @@ -90,7 +90,6 @@ msys2-32bit: - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinG environment - mkdir output - cd output - - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu - --enable-capstone=system" + - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu" - ..\msys64\usr\bin\bash -lc 'make -j2' - ..\msys64\usr\bin\bash -lc 'make check' |