From b79b8cd340473ab4fe5c794cfb96a98ef856aad4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Aug 2023 16:20:34 +0200 Subject: elf2flt: fix for binutils 2.41 and above --- toolchain/elf2flt/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'toolchain') diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile index 7b7d60c36..3310cea04 100644 --- a/toolchain/elf2flt/Makefile +++ b/toolchain/elf2flt/Makefile @@ -8,18 +8,23 @@ include $(ADK_TOPDIR)/mk/buildhlp.mk ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y) BINUTILS_VERSION:= git +BFDLIB:= .libs/libbfd.a endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_41),y) BINUTILS_VERSION:= 2.41 +BFDLIB:= .libs/libbfd.a endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_40),y) BINUTILS_VERSION:= 2.40 +BFDLIB:= libbfd.a endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_39),y) BINUTILS_VERSION:= 2.39 +BFDLIB:= libbfd.a endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_28),y) BINUTILS_VERSION:= 2.28 +BFDLIB:= libbfd.a endif $(WRKBUILD)/.configured: @@ -30,7 +35,7 @@ $(WRKBUILD)/.configured: --target=$(GNU_TARGET_NAME) \ --with-bfd-include-dir=$(TOOLCHAIN_BUILD_DIR)/w-binutils-$(BINUTILS_VERSION)-1/binutils-$(BINUTILS_VERSION)/bfd \ --with-binutils-include-dir=$(TOOLCHAIN_BUILD_DIR)/w-binutils-$(BINUTILS_VERSION)-1/binutils-$(BINUTILS_VERSION)/include \ - --with-libbfd=$(TOOLCHAIN_BUILD_DIR)/w-binutils-$(BINUTILS_VERSION)-1/binutils-$(BINUTILS_VERSION)/bfd/libbfd.a \ + --with-libbfd=$(TOOLCHAIN_BUILD_DIR)/w-binutils-$(BINUTILS_VERSION)-1/binutils-$(BINUTILS_VERSION)/bfd/$(BFDLIB) \ --with-libiberty=$(TOOLCHAIN_BUILD_DIR)/w-binutils-$(BINUTILS_VERSION)-1/binutils-$(BINUTILS_VERSION)/libiberty/libiberty.a ) touch $@ -- cgit v1.2.3