diff options
| author | makise-homura <akemi_homura@kurisa.ch> | 2018-03-20 17:26:04 +0300 |
|---|---|---|
| committer | makise-homura <akemi_homura@kurisa.ch> | 2018-03-20 17:26:04 +0300 |
| commit | 942e34241f9b7430c56b9936c1309665662816bb (patch) | |
| tree | 2b830a34dc0b3848aacd4bfd4309d89ce53f4038 | |
| parent | 3b254c6e49a406235a2c82efa3698bacb0995a35 (diff) | |
| download | meson-942e34241f9b7430c56b9936c1309665662816bb.zip meson-942e34241f9b7430c56b9936c1309665662816bb.tar.gz meson-942e34241f9b7430c56b9936c1309665662816bb.tar.bz2 | |
Fixed compatibility issue regarding Python 3.5
In Python 3.5 os.path.join accepts str or bytes, not path-like
objects as in Python 3.6.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index b9f614e..a52d1f7 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1166,7 +1166,7 @@ int dummy; abs_vala_file = os.path.join(self.environment.get_build_dir(), vala_file) if PurePath(os.path.commonpath((abs_srcbasedir, abs_vala_file))) == PurePath(abs_srcbasedir): vala_c_subdir = PurePath(abs_vala_file).parent.relative_to(abs_srcbasedir) - vala_c_file = os.path.join(vala_c_subdir, vala_c_file) + vala_c_file = os.path.join(str(vala_c_subdir), vala_c_file) else: path_to_target = os.path.join(self.build_to_src, target.get_subdir()) if vala_file.startswith(path_to_target): |