diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-21 22:31:10 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-21 22:31:10 +0300 |
| commit | ff51f2196f39da034151b54da3088c0d70ae4eee (patch) | |
| tree | 410793d3fe90971d00c71d7248f3aada8c804706 /backends.py | |
| parent | 1eeec5749f1ce0300ac918995cd2cc2deb3256a7 (diff) | |
| download | meson-ff51f2196f39da034151b54da3088c0d70ae4eee.zip meson-ff51f2196f39da034151b54da3088c0d70ae4eee.tar.gz meson-ff51f2196f39da034151b54da3088c0d70ae4eee.tar.bz2 | |
Make extract_objects work with subdirectories.
Diffstat (limited to 'backends.py')
| -rw-r--r-- | backends.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/backends.py b/backends.py index e346898..88f144d 100644 --- a/backends.py +++ b/backends.py @@ -167,11 +167,12 @@ class Backend(): targetdir = self.get_target_private_dir(extobj.target) suffix = '.' + self.environment.get_object_suffix() for osrc in extobj.srclist: - osrc = osrc.fname + osrc_base = osrc.fname if not self.source_suffix_in_objs: - osrc = '.'.join(osrc.split('.')[:-1]) + osrc_base = '.'.join(osrc.split('.')[:-1]) + objbase = os.path.join(osrc.subdir, osrc.fname).replace('/', '_').replace('\\', '_') objname = os.path.join(proj_dir_to_build_root, - targetdir, os.path.basename(osrc) + suffix) + targetdir, os.path.basename(objbase) + suffix) result.append(objname) return result |