diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-21 23:57:21 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-22 00:21:25 +0530 |
| commit | 0ebf79ec8b74c8cbb1ea96fff740a8dfd80340b1 (patch) | |
| tree | 4e52ae0e6c91b41b7a7d122acc549c38eb23d033 | |
| parent | 93f3a6670ff0ed125986a2e0885eba0c9141bc10 (diff) | |
| download | meson-0ebf79ec8b74c8cbb1ea96fff740a8dfd80340b1.zip meson-0ebf79ec8b74c8cbb1ea96fff740a8dfd80340b1.tar.gz meson-0ebf79ec8b74c8cbb1ea96fff740a8dfd80340b1.tar.bz2 | |
configure_file: Accept output of configure_file as input
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 0eb392d..eaaea73 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2313,9 +2313,11 @@ class Interpreter(InterpreterBase): raise InterpreterException('Input must be a string or a file') if isinstance(inputfile, str): inputfile = os.path.join(self.subdir, inputfile) + ifile_abs = os.path.join(self.environment.source_dir, inputfile) else: + ifile_abs = inputfile.absolute_path(self.environment.source_dir, + self.environment.build_dir) inputfile = inputfile.relative_name() - ifile_abs = os.path.join(self.environment.source_dir, inputfile) elif 'command' in kwargs and '@INPUT@' in kwargs['command']: raise InterpreterException('@INPUT@ used as command argument, but no input file specified.') # Validate output |