Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix undefined variables in ObjC/C++ detection 

Pointed out by Mike Sinkovsky
This commit is contained in:
Nirbheek Chauhan 2017-02-23 03:01:26 +05:30 committed by Jussi Pakkanen
parent 7cece438cc
commit 4f0e204c34
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mesonbuild/environment.py
View File

@ -511,10 +511,11 @@ class Environment:
for compiler in compilers: for compiler in compilers:
if isinstance(compiler, str): if isinstance(compiler, str):
compiler = [compiler] compiler = [compiler]
arg = ['--version']
try: try:
p, out, err = Popen_safe(compiler + ['--version']) p, out, err = Popen_safe(compiler + arg)
except OSError: except OSError as e:
popen_exceptions[' '.join(compiler + [arg])] = e popen_exceptions[' '.join(compiler + arg)] = e
version = search_version(out) version = search_version(out)
if 'Free Software Foundation' in out: if 'Free Software Foundation' in out:
defines = self.get_gnu_compiler_defines(compiler) defines = self.get_gnu_compiler_defines(compiler)
@ -536,10 +537,11 @@ class Environment:
for compiler in compilers: for compiler in compilers:
if isinstance(compiler, str): if isinstance(compiler, str):
compiler = [compiler] compiler = [compiler]
arg = ['--version']
try: try:
p, out, err = Popen_safe(compiler + ['--version']) p, out, err = Popen_safe(compiler + arg)
except OSError: except OSError as e:
popen_exceptions[' '.join(compiler + [arg])] = e popen_exceptions[' '.join(compiler + arg)] = e
version = search_version(out) version = search_version(out)
if 'Free Software Foundation' in out: if 'Free Software Foundation' in out:
defines = self.get_gnu_compiler_defines(compiler) defines = self.get_gnu_compiler_defines(compiler)