diff mbox series

[PULL,01/22] submodules: bump meson to 0.55.3

Message ID 20201016114814.1564523-2-pbonzini@redhat.com
State New
Headers show
Series Build system + misc changes for 2020-10-16 | expand

Commit Message

Paolo Bonzini Oct. 16, 2020, 11:47 a.m. UTC 
This adds some bugfixes, and allows MSYS2 to configure
without "--ninja=ninja".

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 .cirrus.yml | 3 +--
 meson       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/.cirrus.yml b/.cirrus.yml
index 99d118239c..0f46cb5eaf 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"
diff --git a/meson b/meson
index 68ed748f84..776acd2a80 160000
--- a/meson
+++ b/meson
@@ -1 +1 @@ 
-Subproject commit 68ed748f84f14c2d4e62dcbd123816e5898eb04c
+Subproject commit 776acd2a805c9b42b4f0375150977df42130317f