diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-10 14:47:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 14:47:35 -0500 |
| commit | e02aaad63286169aebf63109363fed648a185b05 (patch) | |
| tree | a44ba27d19b09bd0b225a643f496c975007dc5a2 /mesonbuild/backend/ninjabackend.py | |
| parent | fd425d56a5680ab48d1cd03a140c249d90999a09 (diff) | |
| parent | b1898fd13959cbd49987efedef68a38ab9abb464 (diff) | |
| download | meson-e02aaad63286169aebf63109363fed648a185b05.zip meson-e02aaad63286169aebf63109363fed648a185b05.tar.gz meson-e02aaad63286169aebf63109363fed648a185b05.tar.bz2 | |
Merge pull request #1011 from centricular/runtarget-files-rel-builddir
ninja: Pass absolute path of files to run targets
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3d378fe..76f47ab 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -515,10 +515,10 @@ int dummy; arg_strings.append(os.path.join(self.environment.get_build_dir(), relfname)) deps.append(relfname) elif isinstance(i, mesonlib.File): - arg_strings.append(i.rel_to_builddir(self.build_to_src)) + relfname = i.rel_to_builddir(self.build_to_src) + arg_strings.append(os.path.join(self.environment.get_build_dir(), relfname)) else: - mlog.debug(str(i)) - raise MesonException('Unreachable code in generate_run_target.') + raise AssertionError('Unreachable code in generate_run_target: ' + str(i)) elem = NinjaBuildElement(self.all_outputs, target.name, 'CUSTOM_COMMAND', []) cmd = runnerscript + [self.environment.get_source_dir(), self.environment.get_build_dir(), target.subdir] texe = target.command |