diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-01-16 18:04:59 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-01-16 18:04:59 +0200 |
| commit | d6e176f45589485786fe87ba7ef15fe7fd8302d1 (patch) | |
| tree | ba0f5ee99fc202c93869c37cdcb585e9ceafdc81 /mesonbuild/ninjabackend.py | |
| parent | 23b98cd6e66c6ae0f070e28e0f8b1566c0b5e585 (diff) | |
| download | meson-d6e176f45589485786fe87ba7ef15fe7fd8302d1.zip meson-d6e176f45589485786fe87ba7ef15fe7fd8302d1.tar.gz meson-d6e176f45589485786fe87ba7ef15fe7fd8302d1.tar.bz2 | |
Made gtkdoc and run targets work.
Diffstat (limited to 'mesonbuild/ninjabackend.py')
| -rw-r--r-- | mesonbuild/ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/ninjabackend.py b/mesonbuild/ninjabackend.py index 36c5ce9..89aa573 100644 --- a/mesonbuild/ninjabackend.py +++ b/mesonbuild/ninjabackend.py @@ -362,7 +362,7 @@ int dummy; self.processed_targets[target.name + target.type_suffix()] = True def generate_run_target(self, target, outfile): - runnerscript = os.path.join(self.environment.get_script_dir(), 'commandrunner.py') + runnerscript = [sys.executable, self.environment.get_build_command(), '--internal', 'commandrunner'] deps = [] arg_strings = [] for i in target.args: @@ -376,7 +376,7 @@ int dummy; mlog.debug(str(i)) raise MesonException('Unreachable code in generate_run_target.') elem = NinjaBuildElement(target.name, 'CUSTOM_COMMAND', deps) - cmd = [sys.executable, runnerscript, self.environment.get_source_dir(), self.environment.get_build_dir(), target.subdir] + cmd = runnerscript + [self.environment.get_source_dir(), self.environment.get_build_dir(), target.subdir] texe = target.command try: texe = texe.held_object |