浏览代码

From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Fri, 8 Aug 2014 17:37:36 +0200
Subject: [PATCH 2/4] Add support for cross compilation

This changes the logic that defines ARCH (and HOSTARCH) to take CROSS_COMPILE
into account. Also, $prefix is not assigned, so that the default will be what
is on the path rather than hardcoded in /usr/bin.

This results in the build doing the right thing if CROSS_COMPILE is set in the
environment and no ARCH or prefix options are passed to make, aligning it with
most other CROSS_COMPILE compatible projects.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Nigel Croxon <nigel.croxon@hp.com>

Nigel Croxon 10 年之前
父节点
当前提交
fb063f0f65
共有 1 个文件被更改,包括 10 次插入10 次删除
  1. 10 10
      gnu-efi-3.0/Make.defaults

+ 10 - 10
gnu-efi-3.0/Make.defaults

@@ -51,19 +51,19 @@ LIBDIR 	     := $(PREFIX)/lib
 INSTALL	     := install
 
 # Compilation tools
-prefix       := /usr/bin/
-CC           := $(prefix)gcc
-AS           := $(prefix)as
-LD           := $(prefix)ld
-AR           := $(prefix)ar
-RANLIB       := $(prefix)ranlib
-OBJCOPY      := $(prefix)objcopy
+HOSTCC       := $(prefix)gcc
+CC           := $(prefix)$(CROSS_COMPILE)gcc
+AS           := $(prefix)$(CROSS_COMPILE)as
+LD           := $(prefix)$(CROSS_COMPILE)ld
+AR           := $(prefix)$(CROSS_COMPILE)ar
+RANLIB       := $(prefix)$(CROSS_COMPILE)ranlib
+OBJCOPY      := $(prefix)$(CROSS_COMPILE)objcopy
 
 
 # Host/target identification
-OS	     := $(shell uname -s)
-HOSTARCH     := $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
-ARCH	     := $(shell uname -m | sed s,i[3456789]86,ia32,)
+OS           := $(shell uname -s)
+HOSTARCH     := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
+ARCH         := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed s,i[3456789]86,ia32,)
 
 # FreeBSD (and possibly others) reports amd64 instead of x86_64
 ifeq ($(ARCH),amd64)