From 33217038b4cfe89b0e6f023b268d00182bee2717 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Fri, 11 Sep 2015 22:02:24 +0300 Subject: [PATCH] Put full path to exe_wrapped run targets in case the runner script assumes that the runnable binary needs to be in PATH. --- ninjabackend.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ninjabackend.py b/ninjabackend.py index 337528fc0..0d07dc04a 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