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.
0.54
Nirbheek Chauhan 5 years ago
parent 02f6fbd784
commit 435c7679c1
  1. 2
      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] unpacked_src_dir = unpacked_files[0]
with open(os.path.join(bld_root, 'meson-info', 'intro-buildoptions.json')) as boptions: 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) 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 meson_command += extra_meson_args
ret = run_dist_steps(meson_command, unpacked_src_dir, builddir, installdir, ninja_bin) ret = run_dist_steps(meson_command, unpacked_src_dir, builddir, installdir, ninja_bin)

Loading…
Cancel
Save