summaryrefslogtreecommitdiff
path: root/mesonbuild/scripts
diff options
context:
space:
mode:
authorL. E. Segovia <amy@amyspark.me>2023-08-30 22:37:21 -0300
committerEli Schwartz <eschwartz93@gmail.com>2023-09-15 07:31:37 -0400
commit878d950887f5d02b830ea190262af5d0491ae0f8 (patch)
tree74a90157378458d2ae4fd9c32bc9f4895f14c07c /mesonbuild/scripts
parent1306d156163fcbae2e1bf8cf89b98f7eec1465a3 (diff)
downloadmeson-878d950887f5d02b830ea190262af5d0491ae0f8.tar.gz
environment, env2mfile: Don't shell split paths if they point to a valid executable
Fixes #11128
Diffstat (limited to 'mesonbuild/scripts')
-rwxr-xr-xmesonbuild/scripts/env2mfile.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
index df9373042..1a6d0ce97 100755
--- a/mesonbuild/scripts/env2mfile.py
+++ b/mesonbuild/scripts/env2mfile.py
@@ -296,7 +296,10 @@ def detect_compilers_from_envvars(envvar_suffix: str = '') -> MachineInfo:
compilerstr = os.environ.get(envvarname + envvar_suffix)
if not compilerstr:
continue
- compiler = shlex.split(compilerstr)
+ if os.path.exists(compilerstr):
+ compiler = [compilerstr]
+ else:
+ compiler = shlex.split(compilerstr)
infos.compilers[langname] = compiler
lang_compile_args, lang_link_args = detect_language_args_from_envvars(langname, envvar_suffix)
if lang_compile_args: