From 796621c56aaed0a2b4c7c1fcec011f22501e94fc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Aug 2013 20:40:16 +0200 Subject: [PATCH] package/Makefile.in: fix ABI name for EABIhf targets The current code to set ABI on ARM does the following: ifeq ($(BR2_arm)$(BR2_armeb),y) ... set ABI without 'hf' suffix ... else ifeq ($(BR2_ARM_EABIHF),y) ... set ABI with 'hf' suffix ... endif But since $(BR2_arm)$(BR2_armeb) will always be 'y' in the cases where BR2_ARM_EABIHF is 'y', it means that the 'else' part of the condition will never be used. Fix this by appending 'hf' to the ABI variable when BR2_ARM_EABIHF is selected. [Peter: put EABIhf handling under arm/armeb conditional for consistency] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Makefile.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index aed28d5a27..91ae1b9bc8 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -46,11 +46,9 @@ ABI=gnueabi else ABI=eabi endif -else ifeq ($(BR2_ARM_EABIHF),y) -ifeq ($(LIBC),uclibc) -ABI=gnueabihf -else -ABI=eabihf + +ifeq ($(BR2_ARM_EABIHF),y) +ABI:=$(ABI)hf endif endif -- 2.30.2