diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-06-12 02:04:38 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-06-13 11:02:19 +0000 |
| commit | ec1bd22b15a5bfbd4599ebf30e8c63067f336f29 (patch) | |
| tree | 1271ec2b93ad258f30cd4e9c3c0de41868d9ed0d | |
| parent | 36d4ccaf806660f1a65a959e88e228bd3f5fb746 (diff) | |
| download | meson-ec1bd22b15a5bfbd4599ebf30e8c63067f336f29.zip meson-ec1bd22b15a5bfbd4599ebf30e8c63067f336f29.tar.gz meson-ec1bd22b15a5bfbd4599ebf30e8c63067f336f29.tar.bz2 | |
mdist: Filter out buildtype to avoid warning
Since we parse buildoptions.json to pass options, we end up passing
-Dbuildtype and also -Doptimization and -Ddebug which triggers the
warning:
WARNING: Recommend using either -Dbuildtype or -Doptimization + -Ddebug [...]
Filter out buildtype. It is redundant.
| -rw-r--r-- | mesonbuild/mdist.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mdist.py b/mesonbuild/mdist.py index b324f76..5ab0ad4 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -213,7 +213,7 @@ def check_dist(packagename, meson_command, extra_meson_args, bld_root, privdir): unpacked_src_dir = unpacked_files[0] with open(os.path.join(bld_root, 'meson-info', 'intro-buildoptions.json')) as boptions: meson_command += ['-D{name}={value}'.format(**o) for o in json.load(boptions) - if o['name'] not in ['backend', 'install_umask']] + if o['name'] not in ['backend', 'install_umask', 'buildtype']] meson_command += extra_meson_args ret = run_dist_steps(meson_command, unpacked_src_dir, builddir, installdir, ninja_bin) |