diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-15 03:20:45 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-17 10:45:42 -0400 |
| commit | 6ebd89cf9ca3f5a6948542c4522b9380b1e9539f (patch) | |
| tree | 07af190d984894de7b22cfa7e91295c0fed78252 | |
| parent | 3e40748834923798aa57e3751db13a069e2c617b (diff) | |
| download | qemu-6ebd89cf9ca3f5a6948542c4522b9380b1e9539f.zip qemu-6ebd89cf9ca3f5a6948542c4522b9380b1e9539f.tar.gz qemu-6ebd89cf9ca3f5a6948542c4522b9380b1e9539f.tar.bz2 | |
submodules: bump meson to 0.55.3
This adds some bugfixes, and allows MSYS2 to configure
without "--ninja=ninja".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | .cirrus.yml | 3 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| m--------- | meson | 0 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 99d1182..0f46cb5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -123,8 +123,7 @@ windows_msys2_task: script: - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure - --python=python3 --ninja=ninja" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3" - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8" test_script: - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check" @@ -1866,7 +1866,7 @@ python_version=$($python -c 'import sys; print("%d.%d.%d" % (sys.version_info[0] python="$python -B" if test -z "$meson"; then - if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.55.1; then + if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.55.3; then meson=meson elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then meson=git diff --git a/meson b/meson -Subproject 68ed748f84f14c2d4e62dcbd123816e5898eb04 +Subproject 776acd2a805c9b42b4f0375150977df42130317 |