|
 |
ba2c15 |
From 5fa13d4609ae6187f68928c6e0834cdf716442f9 Mon Sep 17 00:00:00 2001
|
|
|
ba2c15 |
From: Peter Jones <pjones@redhat.com>
|
|
|
ba2c15 |
Date: Tue, 13 Mar 2018 15:20:22 -0400
|
|
|
ba2c15 |
Subject: [PATCH 12/25] Fix arm build paths in the makefile
|
|
|
ba2c15 |
|
|
|
ba2c15 |
Previous work was apparently done with arm-linux-gnueabi-gcc as a
|
|
|
ba2c15 |
cross-builder, but our armv7 builders have native gcc with the target as
|
|
|
ba2c15 |
armv7hl-linux-gnueabi, so we need to munge the arch there to get our arm
|
|
|
ba2c15 |
path.
|
|
|
ba2c15 |
|
|
|
ba2c15 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
ba2c15 |
Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
|
|
|
ba2c15 |
---
|
|
|
ba2c15 |
Make.defaults | 4 ++--
|
|
|
ba2c15 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
ba2c15 |
|
|
|
ba2c15 |
diff --git a/Make.defaults b/Make.defaults
|
|
|
ba2c15 |
index 446e676dc14..6d300fb0f24 100755
|
|
|
ba2c15 |
--- a/Make.defaults
|
|
|
ba2c15 |
+++ b/Make.defaults
|
|
|
ba2c15 |
@@ -62,12 +62,12 @@ OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy
|
|
|
ba2c15 |
|
|
|
ba2c15 |
# Host/target identification
|
|
|
ba2c15 |
OS := $(shell uname -s)
|
|
|
ba2c15 |
-HOSTARCH := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
|
|
|
ba2c15 |
+HOSTARCH := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' )
|
|
|
ba2c15 |
ARCH := $(HOSTARCH)
|
|
|
ba2c15 |
|
|
|
ba2c15 |
# Get ARCH from the compiler if cross compiling
|
|
|
ba2c15 |
ifneq ($(CROSS_COMPILE),)
|
|
|
ba2c15 |
- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed s,i[3456789]86,ia32,)
|
|
|
ba2c15 |
+ override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' )
|
|
|
ba2c15 |
endif
|
|
|
ba2c15 |
|
|
|
ba2c15 |
# FreeBSD (and possibly others) reports amd64 instead of x86_64
|
|
|
ba2c15 |
--
|
|
|
ba2c15 |
2.15.0
|
|
|
ba2c15 |
|