diff options
| author | Nicolas Schneider <nioncode+git@gmail.com> | 2016-03-01 14:31:37 +0100 |
|---|---|---|
| committer | Nicolas Schneider <nioncode+git@gmail.com> | 2016-03-01 14:31:37 +0100 |
| commit | 9f9f73fa5208bdabed5fae59af0b0b0e7d177dec (patch) | |
| tree | 33bf4a11c051c346516cc32da75e78bc87566870 /mesonbuild | |
| parent | 92187501ed51448b4ee596d059b1cd88e856fe56 (diff) | |
| download | meson-9f9f73fa5208bdabed5fae59af0b0b0e7d177dec.zip meson-9f9f73fa5208bdabed5fae59af0b0b0e7d177dec.tar.gz meson-9f9f73fa5208bdabed5fae59af0b0b0e7d177dec.tar.bz2 | |
add args support for add_postconf_script
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 9b3cef4..311e16c 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -439,5 +439,5 @@ class Backend(): def run_postconf_scripts(self): for s in self.build.postconf_scripts: - cmd = s.get_command() + [self.environment.get_source_dir(), self.environment.get_build_dir()] + cmd = s['exe'].get_command() + [self.environment.get_source_dir(), self.environment.get_build_dir()] + s['args'] subprocess.check_call(cmd) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 81bb768..6f65790 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -819,7 +819,8 @@ class MesonMain(InterpreterObject): search_dir = os.path.join(self.interpreter.environment.source_dir, self.interpreter.subdir) exe = dependencies.ExternalProgram(scriptbase, search_dir=search_dir) - self.build.postconf_scripts.append(exe) + extras = mesonlib.stringlistify(kwargs.get('args', [])) + self.build.postconf_scripts.append({'exe': exe, 'args': extras}) def current_source_dir_method(self, args, kwargs): src = self.interpreter.environment.source_dir |