diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2021-04-16 14:21:38 +0300 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2021-04-16 15:25:02 +0300 |
| commit | 70d3eecbc58d37c7a799adbc3bb728f2950edf06 (patch) | |
| tree | ae7a1647cf8a740fb2881d9328fb215820ed735d /cargo_wrapper.py | |
| parent | f95b5ee66672a1537f4e9d56e30713c7d1fd06c8 (diff) | |
meson: fix copy of build artifacts
Latest version of cargo-c and cargo are now producing files to
'build/target/x86_64-unknown-linux-gnu/debug/' instead of 'build/target/debug/'.
Fix this by making the glob pattern recursive.
Diffstat (limited to 'cargo_wrapper.py')
| -rw-r--r-- | cargo_wrapper.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cargo_wrapper.py b/cargo_wrapper.py index 06bbde90a..63f61c532 100644 --- a/cargo_wrapper.py +++ b/cargo_wrapper.py @@ -68,14 +68,15 @@ for d in PLUGIN_DIRS: run(cmd, env) if command == 'build': + target_dir = os.path.join(cargo_target_dir, '**', target) # Copy so files to build dir - for f in glob.glob(os.path.join(cargo_target_dir, target, '*.' + ext)): + for f in glob.glob(os.path.join(target_dir, '*.' + ext), recursive=True): shutil.copy(f, meson_build_dir) if ext2: - for f in glob.glob(os.path.join(cargo_target_dir, target, '*.' + ext2)): + for f in glob.glob(os.path.join(target_dir, '*.' + ext2), recursive=True): shutil.copy(f, meson_build_dir) # Copy generated pkg-config files - for f in glob.glob(os.path.join(cargo_target_dir, target, '*.pc')): + for f in glob.glob(os.path.join(target_dir, '*.pc'), recursive=True): shutil.copy(f, meson_build_dir) # Move -uninstalled.pc to meson-uninstalled |