diff options
| author | Liam Staskawicz <liam@stask.net> | 2017-09-17 18:23:37 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-01 15:39:04 +0300 |
| commit | ae532c807c61afa51c17222d284475c1984e0ec8 (patch) | |
| tree | fe2ba38c0f2dc8dad5ddade42598b7077069930f /mesonbuild/backend/backends.py | |
| parent | 7c4f0f97d373045937f1e208a0395feb6dff2bbb (diff) | |
| download | meson-ae532c807c61afa51c17222d284475c1984e0ec8.zip meson-ae532c807c61afa51c17222d284475c1984e0ec8.tar.gz meson-ae532c807c61afa51c17222d284475c1984e0ec8.tar.bz2 | |
backends: avoid extraneous trailing os.path.sep when joining paths
resolves #2336
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 960f2e2..61c5e90 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -162,8 +162,11 @@ class Backend: return os.path.relpath(target_dir, othert_dir) def get_target_source_dir(self, target): - dirname = os.path.join(self.build_to_src, self.get_target_dir(target)) - return dirname + # if target dir is empty, avoid extraneous trailing / from os.path.join() + target_dir = self.get_target_dir(target) + if target_dir: + return os.path.join(self.build_to_src, target_dir) + return self.build_to_src def get_target_private_dir(self, target): dirname = os.path.join(self.get_target_dir(target), target.get_basename() + target.type_suffix()) |