diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-07-01 18:14:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 18:14:34 +0300 |
| commit | 026e386ec2bd79fbf4fcd21e93df19c5a22f3ebf (patch) | |
| tree | ce997fb9df71fa4463f746c1c787168147839392 /mesonbuild/mdist.py | |
| parent | 14cc2efcfef9a404498b3532ffa8130cc092f6f6 (diff) | |
| parent | 576493982da325a739f04e5455ef0643b49d94f1 (diff) | |
| download | meson-026e386ec2bd79fbf4fcd21e93df19c5a22f3ebf.zip meson-026e386ec2bd79fbf4fcd21e93df19c5a22f3ebf.tar.gz meson-026e386ec2bd79fbf4fcd21e93df19c5a22f3ebf.tar.bz2 | |
Merge pull request #6902 from xclaesse/auto-fallback
Implicit dependency fallback when a subproject wrap or dir exists
Diffstat (limited to 'mesonbuild/mdist.py')
| -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 5ab0ad4..9d94ace 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -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') |