diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 00:41:13 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 18:00:00 +0100 |
| commit | bf49316bb9913b7c89de64d6a194be31aa66e16b (patch) | |
| tree | 7d958115bc934653c388412f6afb9f5bf97cb5b1 | |
| parent | 713c83fd00ab16250f05b0c3933f0c8178b8a33e (diff) | |
| download | openembedded-core-contrib-bf49316bb9913b7c89de64d6a194be31aa66e16b.tar.gz | |
populate_base_sdk: Stop running gcc --version all the time
Running 'gcc --version' for every image recipe is slow and increases parsing
time/resource usage for no good reason. Only compute the value in when we're
really running the task/function.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oe/utils.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index c456c52866..bbf1ff1cd2 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -259,7 +259,7 @@ EOF -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ -e '/@SDK_PRE_INSTALL_COMMAND@/d' \ -e '/@SDK_POST_INSTALL_COMMAND@/d' \ - -e 's#@SDK_GCC_VER@#${@oe.utils.host_gcc_version(d)}#g' \ + -e 's#@SDK_GCC_VER@#${@oe.utils.host_gcc_version(d, taskcontextonly=True)}#g' \ ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh # add execution permission diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index f22a6ab596..fbda7035f1 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -342,9 +342,12 @@ def format_pkg_list(pkg_dict, ret_format=None): return '\n'.join(output) -def host_gcc_version(d): +def host_gcc_version(d, taskcontextonly=False): import re, subprocess + if taskcontextonly and d.getVar('BB_WORKERCONTEXT') != '1': + return + compiler = d.getVar("BUILD_CC") try: env = os.environ.copy() |