Skip to content

Commit

Permalink
mdist: Filter out buildtype to avoid warning
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
nirbheek committed Jun 13, 2020
1 parent 36d4cca commit ec1bd22
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mesonbuild/mdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ec1bd22

Please sign in to comment.