From a878c3371c13d77ac8a7a8f4e9fa77407ccf8aeb Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 26 Oct 2020 09:32:07 +0000 Subject: [PATCH] arm/edk2-firmware: set GCC_VER appropriately with meta-clang Also as this isn't actually GCC-specific, rename the variable to EDK_COMPILER. Change-Id: I617f5da642c10decd83124e160b06579c46405ba Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb index f3fb4915..d6f6af1f 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb @@ -56,7 +56,8 @@ export CONF_PATH = "${S}/Conf" export BTOOLS_PATH = "${EDK_TOOLS_PATH}/BinWrappers/PosixLike" -GCC_VER ?= "GCC5" +EDK_COMPILER ?= "GCC5" +EDK_COMPILER_toolchain-clang = "CLANG38" do_compile() { sed -i -e 's:-I \.\.:-I \.\. ${BUILD_CFLAGS} :' ${EDK_TOOLS_PATH}/Source/C/Makefiles/header.makefile @@ -74,13 +75,13 @@ do_compile() { "${S}/BaseTools/BinWrappers/PosixLike/build" \ -a "${EDK2_ARCH}" \ -b ${EDK2_BUILD_MODE} \ - -t ${GCC_VER} \ + -t ${EDK_COMPILER} \ -p "${S}/edk2-platforms/Platform/ARM/${EDK2_PLATFORM_DSC}" } do_install() { install -d ${D}/firmware - install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${GCC_VER}/FV/${EDK2_BIN_NAME} ${D}/firmware/uefi.bin + install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/uefi.bin } FILES_${PN} = "/firmware"