diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-11 22:02:24 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-11 22:02:24 +0300 |
commit | 33217038b4cfe89b0e6f023b268d00182bee2717 (patch) | |
tree | dd7d9b4e38aeee93f6c8697f8e04b1c768ab6852 | |
parent | 840acdd0284984f258987e37bc8cf6b8329a7d2e (diff) | |
download | meson-33217038b4cfe89b0e6f023b268d00182bee2717.zip meson-33217038b4cfe89b0e6f023b268d00182bee2717.tar.gz meson-33217038b4cfe89b0e6f023b268d00182bee2717.tar.bz2 |
Put full path to exe_wrapped run targets in case the runner script assumes that the runnable binary needs to be in PATH.
-rw-r--r-- | ninjabackend.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 337528f..0d07dc0 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -329,12 +329,12 @@ class NinjaBackend(backends.Backend): except AttributeError: pass if isinstance(texe, build.Executable): + abs_exe = os.path.join(self.environment.get_build_dir(), self.get_target_filename(texe)) deps.append(self.get_target_filename(texe)) if self.environment.is_cross_build() \ and self.environment.cross_info.config['binaries'].get('exe_wrapper', None) is not None: - cmd += [self.environment.cross_info.config['binaries']['exe_wrapper'], self.get_target_filename(texe)] - else: - cmd += [os.path.join(self.environment.get_build_dir(), self.get_target_filename(texe))] + cmd += [self.environment.cross_info.config['binaries']['exe_wrapper']] + cmd.append(abs_exe) else: cmd.append(target.command) cmd += target.args |