diff options
author | Marco Felsch <m.felsch@pengutronix.de> | 2024-12-11 19:03:47 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-12-13 12:26:01 +0000 |
commit | b8e99c75a1b0c7c5bb84adcb907061005f504764 (patch) | |
tree | f9cc2f8c07937d502bcc9431bb78b3bfd7ff4602 /meta/classes | |
parent | f391bf2c0804aca812ad24e52c14b30347726111 (diff) | |
download | poky-b8e99c75a1b0c7c5bb84adcb907061005f504764.tar.gz |
icecc: don't use KERNEL_CC during set_icecc_env
The KERNEL_CC variable usage was introduced by commit d2fcaeb153fd
("icecc: Don't generate recipe-sysroot symlinks at recipe-parsing time,
2018-12-20") and is set once a recipe pulls the kernel-arch.bbclass.
There are a few packages, e.g. u-boot, barebox, devicetree, perf which
pull this class and for such packages the get_cross_kernel_cc() return
None because icecc_is_kernel() fail.
Fix this for now by replacing the KERNEL_CC check with the
icecc_is_kernel() helper, which is also used by the
get_cross_kernel_cc().
That said it's still not very robust to determine a compiler based on
a variable or inherited class but at least it fixes the issue for now.
(From OE-Core rev: 5e3c6a6384fcdc4a2269172012caae14e5f327ca)
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/icecc.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 8fe9739f87..8a48f2ad63 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass | |||
@@ -358,7 +358,7 @@ python set_icecc_env() { | |||
358 | symlink_path = os.path.join(ICE_PATH, "symlinks") | 358 | symlink_path = os.path.join(ICE_PATH, "symlinks") |
359 | bb.utils.mkdirhier(symlink_path) | 359 | bb.utils.mkdirhier(symlink_path) |
360 | compilers = [] | 360 | compilers = [] |
361 | if d.getVar('KERNEL_CC'): | 361 | if icecc_is_kernel(bb, d): |
362 | compilers.append(get_cross_kernel_cc(bb,d)) | 362 | compilers.append(get_cross_kernel_cc(bb,d)) |
363 | else: | 363 | else: |
364 | host_prefix = d.getVar('HOST_PREFIX') | 364 | host_prefix = d.getVar('HOST_PREFIX') |