diff options
author | Ross Burton <ross.burton@intel.com> | 2016-12-15 19:09:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 08:40:11 +0000 |
commit | f3e753372baac43d0921186340cf260df056de20 (patch) | |
tree | e0680e353fd90311a0414be8f4894c57f1358aab /meta/lib/oe | |
parent | 9afaeadb37b2b2fab935755ab570cf4b1f3195f4 (diff) | |
download | openembedded-core-contrib-f3e753372baac43d0921186340cf260df056de20.tar.gz |
utils: Always use datastore's PATH for host_gcc_version
BUILD_CC may reference something like ccache and expect this to come from
ccache-native, we at least have some selftests which assume this. Modify the
code to use PATH when runnig BUILD_CC to ensure the tests continue to work
as expected.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-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 bb3f0e5d753..bf440ec960c 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): return '\n'.join(output) def host_gcc_version(d): + import re, subprocess + compiler = d.getVar("BUILD_CC") - retval, output = getstatusoutput("%s --version" % compiler) - if retval: - bb.fatal("Error running %s --version: %s" % (compiler, output)) + try: + env = os.environ.copy() + env["PATH"] = d.getVar("PATH") + output = subprocess.check_output("%s --version" % compiler, shell=True, env=env).decode("utf-8") + except subprocess.CalledProcessError as e: + bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8"))) - import re match = re.match(".* (\d\.\d)\.\d.*", output.split('\n')[0]) if not match: bb.fatal("Can't get compiler version from %s --version output" % compiler) |