BaseTools: Replace ARCH with HOST_ARCH in C Makefile to avoid conflict

https://bugzilla.tianocore.org/show_bug.cgi?id=793

ARCH is too generic. It may cause confuse of target arch or host arch.
To be clarified, replace it with HOST_ARCH in BaseTools C Makefile.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Liming Gao
2017-11-28 11:18:50 +08:00
parent 43e12eeac8
commit a9f6e0a4dc
23 changed files with 51 additions and 51 deletions

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = BootSectImage APPNAME = BootSectImage

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = Brotli APPNAME = Brotli

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
# VPATH = .. # VPATH = ..

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = EfiLdrImage APPNAME = EfiLdrImage

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = EfiRom APPNAME = EfiRom

View File

@ -12,40 +12,40 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ifndef ARCH ifndef HOST_ARCH
# #
# If ARCH is not defined, then we use 'uname -m' to attempt # If HOST_ARCH is not defined, then we use 'uname -m' to attempt
# try to figure out the appropriate ARCH. # try to figure out the appropriate HOST_ARCH.
# #
uname_m = $(shell uname -m) uname_m = $(shell uname -m)
$(info Attempting to detect ARCH from 'uname -m': $(uname_m)) $(info Attempting to detect HOST_ARCH from 'uname -m': $(uname_m))
ifneq (,$(strip $(filter $(uname_m), x86_64 amd64))) ifneq (,$(strip $(filter $(uname_m), x86_64 amd64)))
ARCH=X64 HOST_ARCH=X64
endif endif
ifeq ($(patsubst i%86,IA32,$(uname_m)),IA32) ifeq ($(patsubst i%86,IA32,$(uname_m)),IA32)
ARCH=IA32 HOST_ARCH=IA32
endif endif
ifneq (,$(findstring aarch64,$(uname_m))) ifneq (,$(findstring aarch64,$(uname_m)))
ARCH=AARCH64 HOST_ARCH=AARCH64
endif endif
ifneq (,$(findstring arm,$(uname_m))) ifneq (,$(findstring arm,$(uname_m)))
ARCH=ARM HOST_ARCH=ARM
endif endif
ifndef ARCH ifndef HOST_ARCH
$(info Could not detected ARCH from uname results) $(info Could not detected HOST_ARCH from uname results)
$(error ARCH is not defined!) $(error HOST_ARCH is not defined!)
endif endif
$(info Detected ARCH of $(ARCH) using uname.) $(info Detected HOST_ARCH of $(HOST_ARCH) using uname.)
endif endif
export ARCH export HOST_ARCH
MAKEROOT = . MAKEROOT = .
include Makefiles/header.makefile include Makefiles/header.makefile
all: makerootdir subdirs $(MAKEROOT)/libs all: makerootdir subdirs $(MAKEROOT)/libs
@echo Finished building BaseTools C Tools with ARCH=$(ARCH) @echo Finished building BaseTools C Tools with HOST_ARCH=$(HOST_ARCH)
LIBRARIES = Common LIBRARIES = Common
# NON_BUILDABLE_APPLICATIONS = GenBootSector BootSectImage # NON_BUILDABLE_APPLICATIONS = GenBootSector BootSectImage

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = GenCrc32 APPNAME = GenCrc32

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = GenFfs APPNAME = GenFfs

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = GenFv APPNAME = GenFv

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = GenFw APPNAME = GenFw

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = GenPage APPNAME = GenPage

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = GenSec APPNAME = GenSec

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = GenVtf APPNAME = GenVtf

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = GnuGenBootSector APPNAME = GnuGenBootSector

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = LzmaCompress APPNAME = LzmaCompress

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH = IA32 HOST_ARCH = IA32
!INCLUDE Makefiles\ms.common !INCLUDE Makefiles\ms.common

View File

@ -13,12 +13,12 @@
DEPFILES = $(OBJECTS:%.o=%.d) DEPFILES = $(OBJECTS:%.o=%.d)
$(MAKEROOT)/libs-$(ARCH): $(MAKEROOT)/libs-$(HOST_ARCH):
mkdir -p $(MAKEROOT)/libs-$(ARCH) mkdir -p $(MAKEROOT)/libs-$(HOST_ARCH)
.PHONY: install .PHONY: install
install: $(MAKEROOT)/libs-$(ARCH) $(LIBRARY) install: $(MAKEROOT)/libs-$(HOST_ARCH) $(LIBRARY)
cp $(LIBRARY) $(MAKEROOT)/libs-$(ARCH) cp $(LIBRARY) $(MAKEROOT)/libs-$(HOST_ARCH)
$(LIBRARY): $(OBJECTS) $(LIBRARY): $(OBJECTS)
$(BUILD_AR) crs $@ $^ $(BUILD_AR) crs $@ $^

View File

@ -1,10 +1,10 @@
## @file ## @file
# #
# The makefile can be invoked with # The makefile can be invoked with
# ARCH = x86_64 or x64 for EM64T build # HOST_ARCH = x86_64 or x64 for EM64T build
# ARCH = ia32 or IA32 for IA32 build # HOST_ARCH = ia32 or IA32 for IA32 build
# ARCH = ia64 or IA64 for IA64 build # HOST_ARCH = ia64 or IA64 for IA64 build
# ARCH = Arm or ARM for ARM build # HOST_ARCH = Arm or ARM for ARM build
# #
# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
@ -15,7 +15,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
ARCH ?= IA32 HOST_ARCH ?= IA32
CYGWIN:=$(findstring CYGWIN, $(shell uname -s)) CYGWIN:=$(findstring CYGWIN, $(shell uname -s))
LINUX:=$(findstring Linux, $(shell uname -s)) LINUX:=$(findstring Linux, $(shell uname -s))
@ -27,19 +27,19 @@ BUILD_AS ?= gcc
BUILD_AR ?= ar BUILD_AR ?= ar
BUILD_LD ?= ld BUILD_LD ?= ld
LINKER ?= $(BUILD_CC) LINKER ?= $(BUILD_CC)
ifeq ($(ARCH), IA32) ifeq ($(HOST_ARCH), IA32)
ARCH_INCLUDE = -I $(MAKEROOT)/Include/Ia32/ ARCH_INCLUDE = -I $(MAKEROOT)/Include/Ia32/
endif endif
ifeq ($(ARCH), X64) ifeq ($(HOST_ARCH), X64)
ARCH_INCLUDE = -I $(MAKEROOT)/Include/X64/ ARCH_INCLUDE = -I $(MAKEROOT)/Include/X64/
endif endif
ifeq ($(ARCH), ARM) ifeq ($(HOST_ARCH), ARM)
ARCH_INCLUDE = -I $(MAKEROOT)/Include/Arm/ ARCH_INCLUDE = -I $(MAKEROOT)/Include/Arm/
endif endif
ifeq ($(ARCH), AARCH64) ifeq ($(HOST_ARCH), AARCH64)
ARCH_INCLUDE = -I $(MAKEROOT)/Include/AArch64/ ARCH_INCLUDE = -I $(MAKEROOT)/Include/AArch64/
endif endif
@ -54,7 +54,7 @@ endif
BUILD_LFLAGS = BUILD_LFLAGS =
BUILD_CXXFLAGS = -Wno-unused-result BUILD_CXXFLAGS = -Wno-unused-result
ifeq ($(ARCH), IA32) ifeq ($(HOST_ARCH), IA32)
# #
# Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults
# to x86_64. So make sure tools match uname -m. You can manual have a 64-bit kernal on Snow Leopard # to x86_64. So make sure tools match uname -m. You can manual have a 64-bit kernal on Snow Leopard

View File

@ -19,8 +19,8 @@
!ERROR "BASE_TOOLS_PATH is not set! Please run build_tools.bat at first!" !ERROR "BASE_TOOLS_PATH is not set! Please run build_tools.bat at first!"
!ENDIF !ENDIF
!IFNDEF ARCH !IFNDEF HOST_ARCH
ARCH = IA32 HOST_ARCH = IA32
!ENDIF !ENDIF
MAKE = nmake -nologo MAKE = nmake -nologo
@ -36,7 +36,7 @@ LIB_PATH = $(BASE_TOOLS_PATH)\Lib
SYS_BIN_PATH=$(EDK_TOOLS_PATH)\Bin SYS_BIN_PATH=$(EDK_TOOLS_PATH)\Bin
SYS_LIB_PATH=$(EDK_TOOLS_PATH)\Lib SYS_LIB_PATH=$(EDK_TOOLS_PATH)\Lib
!IF "$(ARCH)"=="IA32" !IF "$(HOST_ARCH)"=="IA32"
ARCH_INCLUDE = $(SOURCE_PATH)\Include\Ia32 ARCH_INCLUDE = $(SOURCE_PATH)\Include\Ia32
BIN_PATH = $(BASE_TOOLS_PATH)\Bin\Win32 BIN_PATH = $(BASE_TOOLS_PATH)\Bin\Win32
LIB_PATH = $(BASE_TOOLS_PATH)\Lib\Win32 LIB_PATH = $(BASE_TOOLS_PATH)\Lib\Win32
@ -44,7 +44,7 @@ SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32
SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32 SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32
!ENDIF !ENDIF
!IF "$(ARCH)"=="X64" !IF "$(HOST_ARCH)"=="X64"
ARCH_INCLUDE = $(SOURCE_PATH)\Include\X64 ARCH_INCLUDE = $(SOURCE_PATH)\Include\X64
BIN_PATH = $(BASE_TOOLS_PATH)\Bin\Win64 BIN_PATH = $(BASE_TOOLS_PATH)\Bin\Win64
LIB_PATH = $(BASE_TOOLS_PATH)\Lib\Win64 LIB_PATH = $(BASE_TOOLS_PATH)\Lib\Win64

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = Split APPNAME = Split

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = TianoCompress APPNAME = TianoCompress

View File

@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = VfrCompile APPNAME = VfrCompile

View File

@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
ARCH ?= IA32 HOST_ARCH ?= IA32
MAKEROOT ?= .. MAKEROOT ?= ..
APPNAME = VolInfo APPNAME = VolInfo