diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-02-09 09:26:12 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-02-09 19:32:20 +0200 |
| commit | 2a8d6690f73ec6415c2ee592e856b3b6de7cfb02 (patch) | |
| tree | 81f5501cbe758c3ae3725320fe2e0e7f2a5b10ce | |
| parent | a155935d24a8c7e80a7849c83153cc864f11c8b0 (diff) | |
| download | meson-2a8d6690f73ec6415c2ee592e856b3b6de7cfb02.zip meson-2a8d6690f73ec6415c2ee592e856b3b6de7cfb02.tar.gz meson-2a8d6690f73ec6415c2ee592e856b3b6de7cfb02.tar.bz2 | |
backends: Fix custom_target() with configure_file() exe
| -rw-r--r-- | mesonbuild/backend/backends.py | 3 | ||||
| -rw-r--r-- | test cases/common/52 run target/meson.build | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index ea4f255..2dbf1ec 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 49e8d75..d1964e8 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', |