diff --git a/vfiouserbuild/Makefile b/vfiouserbuild/Makefile index 41258d495..af7b895d3 100644 --- a/vfiouserbuild/Makefile +++ b/vfiouserbuild/Makefile @@ -19,6 +19,9 @@ all: scan-build build: $(Q)test -d $(VFIO_USER_BUILD_DIR) || \ CC=$(SUB_CC) meson setup $(VFIO_USER_BUILD_DIR) $(VFIO_USER_SRC_DIR) + # Work around pre-v1.9 versions of ninja ignoring new configuration. + $(Q)[ $$((ninja --version; echo 1.9) | sort --version-sort | head -n 1) \ + = 1.9 ] || sleep 0.5 $(Q)meson configure $(VFIO_USER_BUILD_DIR) $(VFIO_USER_CFG_OPTS) $(Q)meson compile $(MESON_COMPILE_OPTS) -C $(VFIO_USER_BUILD_DIR) DESTDIR=$(VFIO_USER_INSTALL_DIR) meson install --quiet -C $(VFIO_USER_BUILD_DIR)