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