diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2022-12-23 11:38:40 +0800 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-01-09 06:30:45 -1000 |
| commit | f2f70bf8d93b33b65875828c0402a98e943f660a (patch) | |
| tree | 2891dbd648e785418de2795dc1da9ba7452952b6 | |
| parent | e9f2d3e18db0c7b3e6e4ea385f54fbb8a02ad324 (diff) | |
| download | openembedded-core-contrib-f2f70bf8d93b33b65875828c0402a98e943f660a.tar.gz | |
base.bbclass: Fix way to check ccache path
The previous code had 2 issues:
1. make hosttools/ccache always link to host's ccache (/usr/bin/ccache)
even we have one buildtools
2. make hosttools/gcc etc, link to host's gcc event we have one
buildtools when keyword ccache in buildtools's path, eg:
/mnt/ccache/bin/buildtools
This patch is for fix above issues.
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1b7c81414cf252a7203d95703810a770184d7e4d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes/base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 19604a4646..3cae577a0e 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -139,7 +139,7 @@ def setup_hosttools_dir(dest, toolsvar, d, fatal=True): # /usr/local/bin/ccache/gcc -> /usr/bin/ccache, then which(gcc) # would return /usr/local/bin/ccache/gcc, but what we need is # /usr/bin/gcc, this code can check and fix that. - if "ccache" in srctool: + if os.path.islink(srctool) and os.path.basename(os.readlink(srctool)) == 'ccache': srctool = bb.utils.which(path, tool, executable=True, direction=1) if srctool: os.symlink(srctool, desttool) |