diff options
| author | Konstantin Kharlamov <Hi-Angel@yandex.ru> | 2022-08-14 01:10:38 +0300 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-09-02 16:04:08 -0400 |
| commit | 251113fa67c90480707cae9341dd8387f3dd6bbd (patch) | |
| tree | 1c2b0c10b4d904f4b2df38b69101035360ede305 | |
| parent | a692395186b9a74817a584444418901da1d7306f (diff) | |
| download | meson-251113fa67c90480707cae9341dd8387f3dd6bbd.zip meson-251113fa67c90480707cae9341dd8387f3dd6bbd.tar.gz meson-251113fa67c90480707cae9341dd8387f3dd6bbd.tar.bz2 | |
backend/ninja: omit --backend when regenerating build dir
Currently a cosmetic bug is present: once a build dir was regenerated,
meson would start showing:
User defined options
backend: ninja
This is not true as user have not defined the option, it is default.
Fix this by omitting the `--backend ninja` parameter from "regenerate"
In my tests this does not affect the situation when one specifies
`--backend ninja` explicitly, it still shows the backend as user-defined
after reconfiguration.
Fixes: https://github.com/mesonbuild/meson/issues/10632
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index a1ba7b9..872cbdf 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1197,9 +1197,7 @@ class NinjaBackend(backends.Backend): ['--internal', 'regenerate', self.environment.get_source_dir(), - self.environment.get_build_dir(), - '--backend', - 'ninja'] + self.environment.get_build_dir()] self.add_rule(NinjaRule('REGENERATE_BUILD', c, [], 'Regenerating build files.', |