From 84ad4092dcd9d2a643086308d94fec672101e99b Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 5 Aug 2013 11:01:19 +0000 Subject: [PATCH] Makefile: fixed an interbug This inobvious buglet has been spotted shortly after 1.1.0 refactoring was roughly over; the problem is that armh-specific targets would get ignored without explicit ARCH=armh. It's commit 768df7e9e98c214c602edd3ee48bd1d72e2dc39c which streamlined introspection within main.mk and a bug in Makefile which left ARCH empty even upon having autodetected it for ARCHES. The current version is more straightforward as a bonus. --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 022c10e0..8596e3f4 100644 --- a/Makefile +++ b/Makefile @@ -6,15 +6,16 @@ -include $(HOME)/.mkimage/profiles.mk # for immediate assignment -ifndef ARCHES -ifdef ARCH -ARCHES := $(ARCH) -else -ARCHES := $(shell arch \ +ifndef ARCH +ARCH := $(shell arch \ | sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/') endif + +ifndef ARCHES +ARCHES := $(ARCH) endif -export ARCHES + +export ARCHES ARCH export PATH := $(CURDIR)/bin:$(PATH)