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