aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-04-15 17:18:44 +0300
committerGitHub <noreply@github.com>2018-04-15 17:18:44 +0300
commit86f725c1e523088c691432c608b3228499ca3c7b (patch)
tree30ee3be8b01895023d4a94d56f10000e11f1de10 /mesonbuild/backend/ninjabackend.py
parentaff597fb99a77b8c1211e30f712f223d6d99587c (diff)
parentdfac0ce8d7db2d445fab71410c37a4c3285ec45a (diff)
downloadmeson-86f725c1e523088c691432c608b3228499ca3c7b.zip
meson-86f725c1e523088c691432c608b3228499ca3c7b.tar.gz
meson-86f725c1e523088c691432c608b3228499ca3c7b.tar.bz2
Merge pull request #3115 from makise-homura/e2k-lcc-support
Support lcc compiler for e2k (Elbrus) architecture
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index e766efa..c941319 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1156,7 +1156,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):