summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/utils.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 2b095f1f0a..36cf74f296 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -231,12 +231,17 @@ def format_pkg_list(pkg_dict, ret_format=None):
231 return '\n'.join(output) 231 return '\n'.join(output)
232 232
233def host_gcc_version(d): 233def host_gcc_version(d):
234 import re, subprocess
235
234 compiler = d.getVar("BUILD_CC", True) 236 compiler = d.getVar("BUILD_CC", True)
235 retval, output = getstatusoutput("%s --version" % compiler)
236 if retval:
237 bb.fatal("Error running %s --version: %s" % (compiler, output))
238 237
239 import re 238 try:
239 env = os.environ.copy()
240 env["PATH"] = d.getVar("PATH", True)
241 output = subprocess.check_output("%s --version" % compiler, shell=True, env=env).decode("utf-8")
242 except subprocess.CalledProcessError as e:
243 bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8")))
244
240 match = re.match(".* (\d\.\d)\.\d.*", output.split('\n')[0]) 245 match = re.match(".* (\d\.\d)\.\d.*", output.split('\n')[0])
241 if not match: 246 if not match:
242 bb.fatal("Can't get compiler version from %s --version output" % compiler) 247 bb.fatal("Can't get compiler version from %s --version output" % compiler)