From e969101aac04d1b0e9cb00681f80f2daf890761f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 11 Jun 2021 21:58:14 -0700 Subject: [PATCH] sbsa-acs,edk2-firmware: Adjust target tuple for clang Current settings assume glibc tuples and hence when building with musl C library clang can not find correct cross tools and system headers and libraries, really we should be using exact tuple that is in play so using HOST_SYS is right replacement for OE Signed-off-by: Khem Raj Cc: Jon Mason Cc: Ross Burton Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index c2d9bf12..23342015 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -64,6 +64,10 @@ export BTOOLS_PATH = "${EDK_TOOLS_PATH}/BinWrappers/PosixLike" EDK_COMPILER ?= "GCC5" EDK_COMPILER_toolchain-clang = "CLANG38" +do_configure_prepend() { + sed -i -e "s#-target ${HOST_ARCH}-linux-gnu*#-target ${HOST_SYS}#" ${S}/BaseTools/Conf/tools_def.template +} + do_compile() { sed -i -e 's:-I \.\.:-I \.\. ${BUILD_CFLAGS} :' ${EDK_TOOLS_PATH}/Source/C/Makefiles/header.makefile sed -i -e 's: -luuid: -luuid ${BUILD_LDFLAGS}:g' ${EDK_TOOLS_PATH}/Source/C/*/GNUmakefile