From 378f899324e44f5c8379ea06d1ea43ea7fa336bd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 28 Jan 2009 06:32:39 +0000 Subject: [PATCH] fix configuration wrt elf2flt The buildroot toolchain is installed in $(STAGING_DIR)/usr/bin and not in $(STAGING_DIR)/bin so let,s adjust the --prefix accordingly. Also the BFLT binary format is always stripped by definition, so it is incompatible with any kind of stripping option. Signed-off-by: Nicolas Pitre --- Config.in | 4 ++-- toolchain/elf2flt/elf2flt.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.in b/Config.in index 31cb70f095..ee7a451346 100644 --- a/Config.in +++ b/Config.in @@ -243,14 +243,14 @@ choice config BR2_STRIP_strip bool "strip" - depends on !BR2_ENABLE_DEBUG + depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT help strip is the normal strip command config BR2_STRIP_sstrip bool "sstrip" select BR2_PACKAGE_SSTRIP_HOST - depends on !BR2_ENABLE_DEBUG + depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT help sstrip is a strip that discards more than the normal strip diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk index 30d7e839ad..f5a92b1f23 100644 --- a/toolchain/elf2flt/elf2flt.mk +++ b/toolchain/elf2flt/elf2flt.mk @@ -27,11 +27,11 @@ $(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched LDFLAGS=-lz \ $(ELF2FLT_DIR)/configure \ --with-bfd-include-dir=$(BINUTILS_DIR1)/bfd/ \ - --with-binutils-include-dir=$(BINUTILS_DIR)/include/ \ + --with-binutils-include-dir=$(BINUTILS_DIR)/include/ \ --target=$(REAL_GNU_TARGET_NAME) \ --with-libbfd=$(BINUTILS_DIR1)/bfd/libbfd.a \ --with-libiberty=$(BINUTILS_DIR1)/libiberty/libiberty.a \ - --prefix=$(STAGING_DIR)) + --prefix=$(STAGING_DIR)/usr) touch $@ $(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured -- 2.30.2