diff options
| author | Peter Jones <pjones@redhat.com> | 2018-03-13 15:20:22 -0400 |
|---|---|---|
| committer | Nigel Croxon <ncroxon@redhat.com> | 2018-03-14 14:50:22 -0400 |
| commit | 5fa13d4609ae6187f68928c6e0834cdf716442f9 (patch) | |
| tree | 6fe922090b66453dbd90d0fc6f00fd1fa660a109 /Make.defaults | |
| parent | a46a62b12b58139c31d4288384808365c4053bf2 (diff) | |
| download | gnu-efi-5fa13d4609ae6187f68928c6e0834cdf716442f9.tar.gz | |
Fix arm build paths in the makefile
Previous work was apparently done with arm-linux-gnueabi-gcc as a
cross-builder, but our armv7 builders have native gcc with the target as
armv7hl-linux-gnueabi, so we need to munge the arch there to get our arm
path.
Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
Diffstat (limited to 'Make.defaults')
| -rwxr-xr-x | Make.defaults | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Make.defaults b/Make.defaults index 446e676..6d300fb 100755 --- a/Make.defaults +++ b/Make.defaults @@ -62,12 +62,12 @@ OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy # Host/target identification OS := $(shell uname -s) -HOSTARCH := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,) +HOSTARCH := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) ARCH := $(HOSTARCH) # Get ARCH from the compiler if cross compiling ifneq ($(CROSS_COMPILE),) - override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed s,i[3456789]86,ia32,) + override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) endif # FreeBSD (and possibly others) reports amd64 instead of x86_64 |