1 files changed, 0 insertions, 3 deletions
diff --git a/recipes-security/optee-imx/optee-fslc.inc b/recipes-security/optee-imx/optee-fslc.inc
index 42e23fc2..6e380e05 100644
--- a/recipes-security/optee-imx/optee-fslc.inc
+++ b/recipes-security/optee-imx/optee-fslc.inc
@@ -17,9 +17,6 @@ OPTEE_ARCH:arm = "arm32"
 OPTEE_ARCH:aarch64 = "arm64"
 OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
-# FIXME - breaks with Clang 18.  See https://github.com/OP-TEE/optee_os/issues/6754
-TOOLCHAIN = "gcc"
 OPTEE_TOOLCHAIN = "${@d.getVar('TOOLCHAIN') or 'gcc'}"
 OPTEE_COMPILER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "${OPTEE_TOOLCHAIN}", "gcc", d)}"

diff --git a/recipes-security/optee-imx/optee-fslc.inc b/recipes-security/optee-imx/optee-fslc.inc index 42e23fc2..6e380e05 100644 --- a/recipes-security/optee-imx/optee-fslc.inc +++ b/recipes-security/optee-imx/optee-fslc.inc
@@ -17,9 +17,6 @@ OPTEE_ARCH:arm = "arm32"
17	OPTEE_ARCH:aarch64 = "arm64"	17	OPTEE_ARCH:aarch64 = "arm64"
18	OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"	18	OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
19		19
20	# FIXME - breaks with Clang 18. See https://github.com/OP-TEE/optee_os/issues/6754
21	TOOLCHAIN = "gcc"
22
23	OPTEE_TOOLCHAIN = "${@d.getVar('TOOLCHAIN') or 'gcc'}"	20	OPTEE_TOOLCHAIN = "${@d.getVar('TOOLCHAIN') or 'gcc'}"
24	OPTEE_COMPILER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "${OPTEE_TOOLCHAIN}", "gcc", d)}"	21	OPTEE_COMPILER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "${OPTEE_TOOLCHAIN}", "gcc", d)}"
25		22