Merge pull request #559 from ItsJamie9494/jamie/meson-setup

builder-module: Use `meson setup` instead of `meson`
flatpak · Sep 4, 2023 · 56e7693 · 56e7693
2 parents 67c892c + e75b246
commit 56e7693
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/builder-module.c b/src/builder-module.c
@@ -1775,6 +1775,12 @@ builder_module_build_helper (BuilderModule  *self,
       prefix = builder_options_get_prefix (self->build_options, context);
       libdir = builder_options_get_libdir (self->build_options, context);
 
+      if (meson)
+	{
+	  /* Meson's setup command is now meson setup */
+          g_ptr_array_add (configure_args_arr, g_strdup ("setup"));
+	}
+
       if (cmake || cmake_ninja)
         {
           g_ptr_array_add (configure_args_arr, g_strdup_printf ("-DCMAKE_INSTALL_PREFIX:PATH='%s'", prefix));