diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-19 08:34:16 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-20 23:32:04 +0530 |
| commit | 79fcd7054d1f25936c559618b6b4349f9d5f5219 (patch) | |
| tree | 02ff0e6965a451db0da3dc19afea4696e407512a | |
| parent | dabf0c1882772700fed2c6c18ca06919a8bc280d (diff) | |
| download | meson-79fcd7054d1f25936c559618b6b4349f9d5f5219.zip meson-79fcd7054d1f25936c559618b6b4349f9d5f5219.tar.gz meson-79fcd7054d1f25936c559618b6b4349f9d5f5219.tar.bz2 | |
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...
| -rw-r--r-- | test cases/common/129 object only target/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/common/129 object only target/meson.build b/test cases/common/129 object only target/meson.build index 58d01d9..d83a658 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) |