aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-12-20 02:01:24 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-20 00:09:02 +0200
commit589a56e78f37861ddf920ae0aa4710b409131fb7 (patch)
tree1ddd071328349f2c794b05d1ce64b61b91c72d41 /mesonbuild/backend
parent9bc07a09412b6ea1ff5e558e97478941b6cbfd18 (diff)
downloadmeson-589a56e78f37861ddf920ae0aa4710b409131fb7.zip
meson-589a56e78f37861ddf920ae0aa4710b409131fb7.tar.gz
meson-589a56e78f37861ddf920ae0aa4710b409131fb7.tar.bz2
Cache the scripts used for postconf and install phases
Cache the absolute dir that the script is searched in and the name of the script. These are the only two things that change. Update the test to test for both #1235 and the case when a script of the same name is in a different directory (which also covers the subproject case). Closes #1235
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r--mesonbuild/backend/backends.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 8b6d181..ca013fa 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -641,7 +641,7 @@ class Backend():
child_env.update(env)
for s in self.build.postconf_scripts:
- cmd = s['exe'].get_command() + s['args']
+ cmd = s['exe'] + s['args']
subprocess.check_call(cmd, env=child_env)
# Subprojects of subprojects may cause the same dep args to be used