[jhbuild] Revert "Allow passing makeargs to Ninja-based modules"

[Emmanuele Bassi <ebassi src gnome org>]

commit f54479328091b70e81b02f5ea8bd1becc614955b
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Dec 18 16:45:57 2017 +0000

    Revert "Allow passing makeargs to Ninja-based modules"
    
    This reverts commit f8c05196933f8c1010c5b9d163567c10c990dda7.
    
    This commit broke valid use cases of makeargs, so we're going to need a
    different option for Ninja.

 jhbuild/modtypes/cmake.py |    3 +--
 jhbuild/modtypes/meson.py |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index 9c68148..d7868db 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -134,8 +134,7 @@ class CMakeModule(MakeModule, DownloadableModule):
         builddir = self.get_builddir(buildscript)
         if self.use_ninja:
             self.ensure_ninja_binary()
-            ninja_cmd = '{} {}'.format(self.ninja_binary, self.get_makeargs(buildscript))
-            buildscript.execute(ninja_cmd, cwd=builddir, extra_env=self.extra_env)
+            buildscript.execute(self.ninja_binary, cwd=builddir, extra_env=self.extra_env)
         else:
             self.make(buildscript)
     do_build.depends = [PHASE_CONFIGURE]
diff --git a/jhbuild/modtypes/meson.py b/jhbuild/modtypes/meson.py
index 5285f55..071c912 100644
--- a/jhbuild/modtypes/meson.py
+++ b/jhbuild/modtypes/meson.py
@@ -141,8 +141,7 @@ class MesonModule(MakeModule, DownloadableModule):
         buildscript.set_action(_('Building'), self)
         builddir = self.get_builddir(buildscript)
         self.ensure_ninja_binary()
-        ninja_cmd = '{} {}'.format(self.ninja_binary, self.get_makeargs(buildscript))
-        buildscript.execute(ninja_cmd, cwd=builddir, extra_env=self.extra_env)
+        buildscript.execute(self.ninja_binary, cwd=builddir, extra_env=self.extra_env)
     do_build.depends = [PHASE_CONFIGURE]
     do_build.error_phases = [PHASE_FORCE_CHECKOUT, PHASE_CONFIGURE]