From 4f0e204c342aa1788b31b105c14aa7bdf914f882 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 23 Feb 2017 03:01:26 +0530 Subject: [PATCH] Fix undefined variables in ObjC/C++ detection Pointed out by Mike Sinkovsky --- mesonbuild/environment.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 88dc4cf70..4bdc4dfaa 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -511,10 +511,11 @@ class Environment: for compiler in compilers: if isinstance(compiler, str): compiler = [compiler] + arg = ['--version'] try: - p, out, err = Popen_safe(compiler + ['--version']) - except OSError: - popen_exceptions[' '.join(compiler + [arg])] = e + p, out, err = Popen_safe(compiler + arg) + except OSError as e: + popen_exceptions[' '.join(compiler + arg)] = e version = search_version(out) if 'Free Software Foundation' in out: defines = self.get_gnu_compiler_defines(compiler) @@ -536,10 +537,11 @@ class Environment: for compiler in compilers: if isinstance(compiler, str): compiler = [compiler] + arg = ['--version'] try: - p, out, err = Popen_safe(compiler + ['--version']) - except OSError: - popen_exceptions[' '.join(compiler + [arg])] = e + p, out, err = Popen_safe(compiler + arg) + except OSError as e: + popen_exceptions[' '.join(compiler + arg)] = e version = search_version(out) if 'Free Software Foundation' in out: defines = self.get_gnu_compiler_defines(compiler)