diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-08-23 20:40:16 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-08-27 22:46:11 +0200 |
| commit | 796621c56aaed0a2b4c7c1fcec011f22501e94fc (patch) | |
| tree | 7ac212b2b68f4f7e912665b72bd17324296e5eaa | |
| parent | 1e4068a3301b9bc1fbc43bfd12e5c5c4b22982ca (diff) | |
| download | buildroot-796621c56aaed0a2b4c7c1fcec011f22501e94fc.tar.gz buildroot-796621c56aaed0a2b4c7c1fcec011f22501e94fc.zip | |
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 <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/Makefile.in | 8 |
1 files 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 |
