zephyr-core/zephyr-kernel: Use the upstream "cross-compile" toolchain

Zephyr upstream contains CMake configuration for a "cross-compile" toolchain for "other cross compilers" which works with the Yocto-built toolchain out-of-the-box, so use this instead of the "yocto" toolchain, which requires a downstream patch to be carried. The Yocto-built toolchain does not support --print-sysroot so that toolchains can be shared between multiple builds with different sysroots, so manually set SYSROOT_DIR to the staging directory. Use the "cross-compile" toolchain by default. Signed-off-by: Peter Hoyes <[email protected]> Signed-off-by: Naveen Saini <[email protected]>
saininav · Feb 24, 2023 · 155bf06 · 155bf06
1 parent c2d10c6
commit 155bf06
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
@@ -7,7 +7,7 @@ inherit ${ZEPHYR_INHERIT_CLASSES}
 # filesystem.
 IMAGE_NO_MANIFEST = "1"
 
-ZEPHYR_TOOLCHAIN_VARIANT ?= "yocto"
+ZEPHYR_TOOLCHAIN_VARIANT ?= "cross-compile"
 require zephyr-toolchain-${ZEPHYR_TOOLCHAIN_VARIANT}.inc
 
 ZEPHYR_MAKE_OUTPUT = "zephyr.elf"

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-cross-compile.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-cross-compile.inc
@@ -0,0 +1,12 @@
+# Additional definitions to use the cross-compile toolchain
+
+CROSS_COMPILE = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}"
+SYSROOT_DIR="${STAGING_DIR_TARGET}"
+
+EXTRA_OECMAKE:append = " \
+    -DCROSS_COMPILE=${CROSS_COMPILE} \
+    -DSYSROOT_DIR=${SYSROOT_DIR} \
+    "
+
+OE_TERMINAL_EXPORTS += "CROSS_COMPILE"
+OE_TERMINAL_EXPORTS += "SYSROOT_DIR"