aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasanori Kakura <kakurasan@gmail.com>2018-09-25 18:04:06 +0900
committerJussi Pakkanen <jpakkane@gmail.com>2018-09-25 20:38:35 -0700
commit99ecedc0930a99fb4d084208964e4c7922a6efec (patch)
tree34353a4c07991898fa783aa28bf2336c3dd71f44
parent80721b7605cee8af8952080fdaf496a14ae37fb6 (diff)
downloadmeson-99ecedc0930a99fb4d084208964e4c7922a6efec.zip
meson-99ecedc0930a99fb4d084208964e4c7922a6efec.tar.gz
meson-99ecedc0930a99fb4d084208964e4c7922a6efec.tar.bz2
environment: Use os.path.basename() when checking mesonlib.meson_command
Without this, when one of Meson's parent directories contains "python", unexpected option "-u" will be passed to Meson.
-rw-r--r--mesonbuild/environment.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 7a44f2f..a0c2fda 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -375,7 +375,7 @@ class Environment:
def get_build_command(self, unbuffered=False):
cmd = mesonlib.meson_command[:]
- if unbuffered and 'python' in cmd[0]:
+ if unbuffered and 'python' in os.path.basename(cmd[0]):
cmd.insert(1, '-u')
return cmd