diff mbox series

icecc: don't use KERNEL_CC during set_icecc_env

Message ID 20241211180348.2128102-3-m.felsch@pengutronix.de
State Accepted, archived
Commit 5e3c6a6384fcdc4a2269172012caae14e5f327ca
Headers show
Series icecc: don't use KERNEL_CC during set_icecc_env | expand

Commit Message

Marco Felsch Dec. 11, 2024, 6:03 p.m. UTC
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.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 meta/classes/icecc.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 8fe9739f870d..8a48f2ad63dc 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -358,7 +358,7 @@  python set_icecc_env() {
     symlink_path = os.path.join(ICE_PATH, "symlinks")
     bb.utils.mkdirhier(symlink_path)
     compilers = []
-    if d.getVar('KERNEL_CC'):
+    if icecc_is_kernel(bb, d):
         compilers.append(get_cross_kernel_cc(bb,d))
     else:
         host_prefix = d.getVar('HOST_PREFIX')