mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-02 01:20:09 +00:00
Code Issues Projects Releases Wiki Activity

optee: Check for meta-clang for TOOLCHAIN variable

Browse Source 
This covers the case when meta-clang is not in layers but TOOLCHAIN
variable is defined ( via config metadata e.g. local.conf ), the value
for TOOLCHAIN should be discarded in this case.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Jon Mason <jon.mason@arm.com>
Cc: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Khem Raj
2021-03-07 09:46:28 -08:00
committed by Jon Mason
parent e06ae8431c
commit aaaf3fac58
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-security/optee/optee.inc
+2 -1
View File
@@ -12,7 +12,8 @@ OPTEE_ARCH_armv7a = "arm32"
OPTEE_ARCH_aarch64 = "arm64" OPTEE_ARCH_aarch64 = "arm64"
OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}" OPTEE_CORE = "${@d.getVar('OPTEE_ARCH').upper()}"
OPTEE_COMPILER = "${@d.getVar('TOOLCHAIN') or 'gcc'}" OPTEE_TOOLCHAIN = "${@d.getVar('TOOLCHAIN') or 'gcc'}"
OPTEE_COMPILER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "${OPTEE_TOOLCHAIN}", "gcc", d)}"
# Set here but not passed to EXTRA_OEMAKE by default as that breaks # Set here but not passed to EXTRA_OEMAKE by default as that breaks
# the optee-os build # the optee-os build