diff options
| author | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
| commit | eaf6343c065842b9719793066e765b2e5f1c2f3b (patch) | |
| tree | 1bfeac5297ba489721e704e63c28f33d0fb98990 /mesonbuild/mdist.py | |
| parent | 87aa98c1787d800145853a8e84654e4c54ee1078 (diff) | |
| parent | 70edf82c6c77902cd64f44848302bbac92d611d8 (diff) | |
| download | meson-lang-enum.zip meson-lang-enum.tar.gz meson-lang-enum.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into lang-enumlang-enum
Diffstat (limited to 'mesonbuild/mdist.py')
| -rw-r--r-- | mesonbuild/mdist.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/mdist.py b/mesonbuild/mdist.py index b324f76..9d94ace 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) @@ -259,7 +259,7 @@ def run(options): if options.include_subprojects: subproject_dir = os.path.join(src_root, b.subproject_dir) for sub in b.subprojects: - _, directory = wrap.get_directory(subproject_dir, sub) + directory = wrap.get_directory(subproject_dir, sub) subprojects.append(os.path.join(b.subproject_dir, directory)) extra_meson_args.append('-Dwrap_mode=nodownload') |