diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-06-12 02:04:38 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-06-14 04:43:57 +0530 |
| commit | 435c7679c1b24156ed5d7eb0d6b0a25630bfbe1f (patch) | |
| tree | e49e7c524f800d7d258c984d6e68aab2a53faf7c | |
| parent | 02f6fbd784c971ab0e5879fae4754d4af59492ca (diff) | |
| download | meson-435c7679c1b24156ed5d7eb0d6b0a25630bfbe1f.zip meson-435c7679c1b24156ed5d7eb0d6b0a25630bfbe1f.tar.gz meson-435c7679c1b24156ed5d7eb0d6b0a25630bfbe1f.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 ea0583e..42a3305 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -210,7 +210,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) |