From 2a8d6690f73ec6415c2ee592e856b3b6de7cfb02 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 9 Feb 2021 09:26:12 -0500 Subject: [PATCH] backends: Fix custom_target() with configure_file() exe --- mesonbuild/backend/backends.py | 3 +++ test cases/common/52 run target/meson.build | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index ea4f255c8..2dbf1ec57 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -408,6 +408,9 @@ class Backend: # common cases. exe_cmd = [self.get_target_filename_abs(exe)] exe_for_machine = MachineChoice.BUILD + elif isinstance(exe, mesonlib.File): + exe_cmd = [exe.rel_to_builddir(self.environment.source_dir)] + exe_for_machine = MachineChoice.BUILD else: exe_cmd = [exe] exe_for_machine = MachineChoice.BUILD diff --git a/test cases/common/52 run target/meson.build b/test cases/common/52 run target/meson.build index 49e8d75b0..d1964e89f 100644 --- a/test cases/common/52 run target/meson.build +++ b/test cases/common/52 run target/meson.build @@ -65,11 +65,14 @@ conf = configure_file( configuration: configuration_data() ) - run_target('configure_script', command : conf ) +custom_target('configure_script_ct', + command: conf, + output: 'dummy.txt', + capture: true) # Target names that clash with potential builtin functionality. run_target('ctags',