From 79fcd7054d1f25936c559618b6b4349f9d5f5219 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 19 Feb 2017 08:34:16 +0530 Subject: [PATCH] tests/common/129: Fix configure_file invocation There is no way for us to know that 'source.c' is a file in the source tree if it's a string. It needs to be a file object. This used to work earlier because we used to incorrectly run the configure_file() command in the source dir (!) instead of the build dir. This had nasty side-effects such as creating files in the source tree unless you specified an absolute path... --- test cases/common/129 object only target/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test cases/common/129 object only target/meson.build b/test cases/common/129 object only target/meson.build index 58d01d930..d83a65825 100644 --- a/test cases/common/129 object only target/meson.build +++ b/test cases/common/129 object only target/meson.build @@ -16,7 +16,7 @@ cc = meson.get_compiler('c').cmd_array().get(-1) # provided by the source tree source1 = configure_file(input : 'source.c', output : 'source' + ext, - command : [comp, cc, 'source.c', + command : [comp, cc, files('source.c'), join_paths(meson.current_build_dir(), 'source' + ext)]) obj = static_library('obj', objects : source1)