From 5667332c4f8e253eea2c1e9235632bf3f18f0d7b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Aug 2023 23:38:20 -0700 Subject: gnu-efi: Always use BFD ld and gnu objcopy Doesnt build with lld and llvm objcopy Signed-off-by: Khem Raj --- conf/nonclangable.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf index 98ac3a4..3135d0f 100644 --- a/conf/nonclangable.conf +++ b/conf/nonclangable.conf @@ -411,7 +411,7 @@ STRIP:pn-minio:toolchain-clang = "${HOST_PREFIX}strip" OBJCOPY:pn-minio:toolchain-clang = "${HOST_PREFIX}objcopy" # | aarch64-yoe-linux-llvm-objcopy: error: invalid output format: 'efi-app-aarch64' -OBJCOPY:pn-gnu-efi:aarch64:toolchain-clang = "${HOST_PREFIX}objcopy" +OBJCOPY:pn-gnu-efi:toolchain-clang = "${HOST_PREFIX}objcopy" # see https://github.com/llvm/llvm-project/issues/54213 # Generates a bad libbsd.so linker stub and apps like bluelsa, mg, netcat-openbsd, android-tools @@ -548,3 +548,5 @@ LDFLAGS:append:pn-gnu-efi:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATUR LDFLAGS:append:pn-libffi:x86:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" LDFLAGS:append:pn-libffi:arm:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" LDFLAGS:append:pn-elfutils:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}" + +LD:pn-gnu-efi:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', d)}" -- cgit v1.2.3-54-g00ecf