1From b2dbeec5063265eb0121342c24a900a4888712a7 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Sun, 20 Jan 2019 21:07:11 +0100
4Subject: [PATCH] Make.defaults: don't override ARCH when cross-compiling
5
6Don't override the user-provided ARCH when cross-compiling otherwise
7ARCH won't be correct for armv5, aarch64 and x86_64
8
9Fixes:
10 - http://autobuild.buildroot.org/results/2dfc0e10da25a8382a43557420d7dc3444c02dbb
11
12Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
13---
14 Make.defaults | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Make.defaults b/Make.defaults
18index 47ed361..7420344 100755
19--- a/Make.defaults
20+++ b/Make.defaults
21@@ -67,7 +67,7 @@ ARCH         ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[345678
22
23 # Get ARCH from the compiler if cross compiling
24 ifneq ($(CROSS_COMPILE),)
25-  override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' )
26+  ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' )
27 endif
28
29 # FreeBSD (and possibly others) reports amd64 instead of x86_64
30--
312.36.1
32
33