From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 1 Aug 2009 21:29:10 +0000 (+0000)
Subject: madwifi: remove the get_arch.mk build failure when the 'detected' arch doesn't match... 
X-Git-Tag: reboot~22786
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9ce792f4441675792b420420c2f117d7c19977be;p=oweals%2Fopenwrt.git

madwifi: remove the get_arch.mk build failure when the 'detected' arch doesn't match the build system's value

SVN-Revision: 17084
---

diff --git a/package/madwifi/patches/106-get_arch.patch b/package/madwifi/patches/106-get_arch.patch
index 4873271138..3140f36799 100644
--- a/package/madwifi/patches/106-get_arch.patch
+++ b/package/madwifi/patches/106-get_arch.patch
@@ -1,6 +1,6 @@
 --- a/scripts/get_arch.mk
 +++ b/scripts/get_arch.mk
-@@ -36,6 +36,13 @@ ifeq (,$(ARCH-y))
+@@ -36,11 +36,14 @@ ifeq (,$(ARCH-y))
  $(Cannot determine ARCH)
  endif
  
@@ -14,3 +14,8 @@
  # Don't allow ARCH to be overridden by a different value.
  ifeq (,$(ARCH))
  ARCH = $(ARCH-y)
+-else
+-ifneq ($(ARCH),$(ARCH-y))
+-$(error ARCH mismatch: supplied "$(ARCH)", determined "$(ARCH-y)")
+-endif
+ endif