From ae532c807c61afa51c17222d284475c1984e0ec8 Mon Sep 17 00:00:00 2001 From: Liam Staskawicz Date: Sun, 17 Sep 2017 18:23:37 -0700 Subject: backends: avoid extraneous trailing os.path.sep when joining paths resolves #2336 --- mesonbuild/backend/backends.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mesonbuild/backend/backends.py') 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()) -- cgit v1.1