From 65b1d339310b2e8d7304d9b2f394bfb968b6c55b Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 17 May 2017 03:42:16 -0400
Subject: Remove unused imports.

---
 mesonbuild/environment.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mesonbuild/environment.py')

diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 13bbe62..c34b2e7 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os, re, subprocess, platform
-from . import coredata
-from . import mesonlib
-from . import mlog
+import os
+import platform
+import re
+
 from .compilers import *
 from .mesonlib import EnvironmentException, Popen_safe
 import configparser
-- 
cgit v1.1


From 83d1c7f06323775c3f75a6bc37b77c348c74de25 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 17 May 2017 05:10:40 -0400
Subject: Rearrange trys to avoid possible undefined vars.

---
 mesonbuild/environment.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mesonbuild/environment.py')

diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index c34b2e7..cd35285 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -459,11 +459,11 @@ class Environment:
         for compiler in compilers:
             if isinstance(compiler, str):
                 compiler = [compiler]
+            if 'cl' in compiler or 'cl.exe' in compiler:
+                arg = '/?'
+            else:
+                arg = '--version'
             try:
-                if 'cl' in compiler or 'cl.exe' in compiler:
-                    arg = '/?'
-                else:
-                    arg = '--version'
                 p, out, err = Popen_safe(compiler + [arg])
             except OSError as e:
                 popen_exceptions[' '.join(compiler + [arg])] = e
-- 
cgit v1.1


From 00f89b0f6ec3cd73bd9859b815548f2267a4fcdc Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 17 May 2017 05:24:40 -0400
Subject: Fix undefined variables/methods.

---
 mesonbuild/environment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mesonbuild/environment.py')

diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index cd35285..bf58472 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -738,7 +738,7 @@ class Environment:
             if p.returncode == 1 and err.startswith('usage'): # OSX
                 return ArLinker(linker)
         self._handle_exceptions(popen_exceptions, linkers, 'linker')
-        raise EnvironmentException('Unknown static linker "%s"' % ' '.join(linker))
+        raise EnvironmentException('Unknown static linker "%s"' % ' '.join(linkers))
 
     def detect_ccache(self):
         try:
-- 
cgit v1.1