diff options
| author | Liming Gao <liming.gao@intel.com> | 2018-01-31 19:59:56 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-02-06 13:52:52 +0800 |
| commit | b6eef092f624f38110a6f4bb7ab36685b47c1e78 (patch) | |
| tree | c39f46cfba0269c9f6cf4647d562be7a50b811a8 /BaseTools | |
| parent | ed536b27f1eb7efa0d002a52e9100f4c3b1922f3 (diff) | |
| download | edk2-b6eef092f624f38110a6f4bb7ab36685b47c1e78.tar.gz edk2-b6eef092f624f38110a6f4bb7ab36685b47c1e78.tar.bz2 edk2-b6eef092f624f38110a6f4bb7ab36685b47c1e78.zip | |
BaseTools GNUmakefile: Move HOST_ARCH detection into common makefile
With this change, enter single tool directory, make can pass.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
(cherry picked from commit 1eac82c878f5f65e2cd4eb6a6553dbddeb739c12)
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/C/Makefiles/header.makefile | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile index e034da258c..0976973bdd 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -6,7 +6,7 @@ # HOST_ARCH = ia64 or IA64 for IA64 build
# HOST_ARCH = Arm or ARM for ARM build
#
-# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
@@ -15,7 +15,31 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-HOST_ARCH ?= IA32
+ifndef HOST_ARCH
+ #
+ # If HOST_ARCH is not defined, then we use 'uname -m' to attempt
+ # try to figure out the appropriate HOST_ARCH.
+ #
+ uname_m = $(shell uname -m)
+ $(info Attempting to detect HOST_ARCH from 'uname -m': $(uname_m))
+ ifneq (,$(strip $(filter $(uname_m), x86_64 amd64)))
+ HOST_ARCH=X64
+ endif
+ ifeq ($(patsubst i%86,IA32,$(uname_m)),IA32)
+ HOST_ARCH=IA32
+ endif
+ ifneq (,$(findstring aarch64,$(uname_m)))
+ HOST_ARCH=AARCH64
+ endif
+ ifneq (,$(findstring arm,$(uname_m)))
+ HOST_ARCH=ARM
+ endif
+ ifndef HOST_ARCH
+ $(info Could not detected HOST_ARCH from uname results)
+ $(error HOST_ARCH is not defined!)
+ endif
+ $(info Detected HOST_ARCH of $(HOST_ARCH) using uname.)
+endif
CYGWIN:=$(findstring CYGWIN, $(shell uname -s))
LINUX:=$(findstring Linux, $(shell uname -s))
|