From dc5a124e1619924be4c5138d11da05810e2d9614 Mon Sep 17 00:00:00 2001 From: twilson Date: Thu, 1 May 2008 16:46:44 +0000 Subject: Allow $(ARCH) to be overridden and pass on through $(KMAKE) git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4213 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8409a03..c7444c3 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,9 @@ ifeq ($(MAKELEVEL),0) PWD:=$(shell pwd) endif +ifeq ($(ARCH),) ARCH:=$(shell uname -m | sed -e s/i.86/i386/) +endif ifeq ($(DEB_HOST_GNU_TYPE),) UNAME_M:=$(shell uname -m) @@ -190,7 +192,7 @@ KMAKE = $(MAKE) -C kernel HOTPLUG_FIRMWARE=no \ UNAME_M=$(UNAME_M) \ BUILD_TOPDIR_MODULES="$(BUILD_TOPDIR_MODULES)" BUILD_SUBDIR_MODULES="$(BUILD_SUBDIR_MODULES)" else -KMAKE = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \ +KMAKE = $(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD)/kernel \ HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) KBUILD_OBJ_M="$(KBUILD_OBJ_M)" endif KMAKE_INST = $(KMAKE) \ -- cgit v1.2.3