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>

diff --git a/BaseTools/Source/C/BootSectImage/GNUmakefile b/BaseTools/Source/C/BootSectImage/GNUmakefile
index 5f7cb98461a3e4c58203785c44da41d7bf3f08fc..90800a46f53b5ea15673771c643938622af02fb2 100644 (file)
--- a/BaseTools/Source/C/BootSectImage/GNUmakefile
+++ b/BaseTools/Source/C/BootSectImage/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = BootSectImage\r

diff --git a/BaseTools/Source/C/BrotliCompress/GNUmakefile b/BaseTools/Source/C/BrotliCompress/GNUmakefile
index 368edbd3c47d085f2cfcd25aab2af86d6d892938..3426a0038734cf0d01fd0c10be82b781f460366a 100644 (file)
--- a/BaseTools/Source/C/BrotliCompress/GNUmakefile
+++ b/BaseTools/Source/C/BrotliCompress/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = Brotli\r

diff --git a/BaseTools/Source/C/Common/GNUmakefile b/BaseTools/Source/C/Common/GNUmakefile
index a19355781749a24ee58247a9ae0812cb8f8749de..5cbca9a16e6763ef615b5d692df2b429a56bf8b4 100644 (file)
--- a/BaseTools/Source/C/Common/GNUmakefile
+++ b/BaseTools/Source/C/Common/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 # VPATH = ..\r

diff --git a/BaseTools/Source/C/EfiLdrImage/GNUmakefile b/BaseTools/Source/C/EfiLdrImage/GNUmakefile
index 99f786f370bd0fa1d599599b25a01f726ea4d65b..75c04ea108b7e4e96a7e7b399299fea2d23b9b35 100644 (file)
--- a/BaseTools/Source/C/EfiLdrImage/GNUmakefile
+++ b/BaseTools/Source/C/EfiLdrImage/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = EfiLdrImage\r

diff --git a/BaseTools/Source/C/EfiRom/GNUmakefile b/BaseTools/Source/C/EfiRom/GNUmakefile
index 433c126cf21e696e7747e596098b1d96c1ed0bed..a13111c18024229bcce103f44bcd7cf553727626 100644 (file)
--- a/BaseTools/Source/C/EfiRom/GNUmakefile
+++ b/BaseTools/Source/C/EfiRom/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = EfiRom\r

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

diff --git a/BaseTools/Source/C/GenCrc32/GNUmakefile b/BaseTools/Source/C/GenCrc32/GNUmakefile
index 15b4dad4b54c9083c14b0d7af918bf21d656404a..a3b4aa8c922e22b4ddf0a765b58fb301a3771aba 100644 (file)
--- a/BaseTools/Source/C/GenCrc32/GNUmakefile
+++ b/BaseTools/Source/C/GenCrc32/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = GenCrc32\r

diff --git a/BaseTools/Source/C/GenFfs/GNUmakefile b/BaseTools/Source/C/GenFfs/GNUmakefile
index 04f5bb83f98c44b0d790b855e111ae5dc12741e5..af0a27c1f89a996dac273e34eaf8d60a691ab2d8 100644 (file)
--- a/BaseTools/Source/C/GenFfs/GNUmakefile
+++ b/BaseTools/Source/C/GenFfs/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = GenFfs\r

diff --git a/BaseTools/Source/C/GenFv/GNUmakefile b/BaseTools/Source/C/GenFv/GNUmakefile
index 58ad16ce61d0f08ec6a5b8af5830d8f0a11a9a2b..008ceb72038999ab2953c73a269605f8ab0c55c9 100644 (file)
--- a/BaseTools/Source/C/GenFv/GNUmakefile
+++ b/BaseTools/Source/C/GenFv/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = GenFv\r

diff --git a/BaseTools/Source/C/GenFw/GNUmakefile b/BaseTools/Source/C/GenFw/GNUmakefile
index ec5b87265fdce87e73ff7845ffd217632a4e2255..89b2aa673dda3b30131fb52c52582afcd415fb45 100644 (file)
--- a/BaseTools/Source/C/GenFw/GNUmakefile
+++ b/BaseTools/Source/C/GenFw/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = GenFw\r

diff --git a/BaseTools/Source/C/GenPage/GNUmakefile b/BaseTools/Source/C/GenPage/GNUmakefile
index e1eab8747c117c2087b9e656ff2ed54e725a9a6f..9b5a4d357585f9786b67dd0a493c976c25be06a3 100644 (file)
--- a/BaseTools/Source/C/GenPage/GNUmakefile
+++ b/BaseTools/Source/C/GenPage/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = GenPage\r

diff --git a/BaseTools/Source/C/GenSec/GNUmakefile b/BaseTools/Source/C/GenSec/GNUmakefile
index c2d289cd2037a32c1a514f5045e3365afd2f02ce..6c8fd448da125cd03e74be169378bab558ceb801 100644 (file)
--- a/BaseTools/Source/C/GenSec/GNUmakefile
+++ b/BaseTools/Source/C/GenSec/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = GenSec\r

diff --git a/BaseTools/Source/C/GenVtf/GNUmakefile b/BaseTools/Source/C/GenVtf/GNUmakefile
index ff6599f1c9881a9c67d87ca76c9a6af9e52499a1..4eb4cc70ad110c2ba7c628afe82332fed2ee5c13 100644 (file)
--- a/BaseTools/Source/C/GenVtf/GNUmakefile
+++ b/BaseTools/Source/C/GenVtf/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = GenVtf\r

diff --git a/BaseTools/Source/C/GnuGenBootSector/GNUmakefile b/BaseTools/Source/C/GnuGenBootSector/GNUmakefile
index e9d32f819571e128eabdce42b3b27cd6f3a1f93c..350014a56c21d63202bc03a9450a3198081a6f83 100644 (file)
--- a/BaseTools/Source/C/GnuGenBootSector/GNUmakefile
+++ b/BaseTools/Source/C/GnuGenBootSector/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = GnuGenBootSector\r

diff --git a/BaseTools/Source/C/LzmaCompress/GNUmakefile b/BaseTools/Source/C/LzmaCompress/GNUmakefile
index 63d7ee0bc3439673fe89300bb781e185e9e433d0..390a97fe89c738564260c018413bc26fe24e2c4b 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/GNUmakefile
+++ b/BaseTools/Source/C/LzmaCompress/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = LzmaCompress\r

diff --git a/BaseTools/Source/C/Makefile b/BaseTools/Source/C/Makefile
index 77d3b979c9b09274852db1cbeed4c72e88a280d6..50be773d57779c672e21021de4c1a7273b1d4a80 100644 (file)
--- a/BaseTools/Source/C/Makefile
+++ b/BaseTools/Source/C/Makefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH = IA32\r
+HOST_ARCH = IA32\r
 \r
 !INCLUDE Makefiles\ms.common\r
 \r

diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile
index 390873bf5c9a96d7adde6ee49dee160bf7ac14d1..0926aa9645479bf8a851e7ced9a267de6eaa9026 100644 (file)
--- a/BaseTools/Source/C/Makefiles/footer.makefile
+++ b/BaseTools/Source/C/Makefiles/footer.makefile
@@ -13,12 +13,12 @@
 \r
 DEPFILES = $(OBJECTS:%.o=%.d)\r
 \r
-$(MAKEROOT)/libs-$(ARCH):\r
-       mkdir -p $(MAKEROOT)/libs-$(ARCH)\r
+$(MAKEROOT)/libs-$(HOST_ARCH):\r
+       mkdir -p $(MAKEROOT)/libs-$(HOST_ARCH)\r
 \r
 .PHONY: install\r
-install: $(MAKEROOT)/libs-$(ARCH) $(LIBRARY)\r
-       cp $(LIBRARY) $(MAKEROOT)/libs-$(ARCH)\r
+install: $(MAKEROOT)/libs-$(HOST_ARCH) $(LIBRARY)\r
+       cp $(LIBRARY) $(MAKEROOT)/libs-$(HOST_ARCH)\r
 \r
 $(LIBRARY): $(OBJECTS) \r
        $(BUILD_AR) crs $@ $^\r

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

diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index 69735e69f3b6884ed1ef5dc025d520a3c8763428..a6bfea5036c4fc5c0ffcb3ea1a9c0c654cc4382c 100644 (file)
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -19,8 +19,8 @@
 !ERROR "BASE_TOOLS_PATH is not set! Please run build_tools.bat at first!"\r
 !ENDIF\r
 \r
-!IFNDEF ARCH\r
-ARCH = IA32\r
+!IFNDEF HOST_ARCH\r
+HOST_ARCH = IA32\r
 !ENDIF\r
 \r
 MAKE        = nmake -nologo\r
@@ -36,7 +36,7 @@ LIB_PATH    = $(BASE_TOOLS_PATH)\Lib
 SYS_BIN_PATH=$(EDK_TOOLS_PATH)\Bin\r
 SYS_LIB_PATH=$(EDK_TOOLS_PATH)\Lib\r
 \r
-!IF "$(ARCH)"=="IA32"\r
+!IF "$(HOST_ARCH)"=="IA32"\r
 ARCH_INCLUDE = $(SOURCE_PATH)\Include\Ia32\r
 BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win32\r
 LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win32\r
@@ -44,7 +44,7 @@ SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32
 SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32\r
 !ENDIF\r
 \r
-!IF "$(ARCH)"=="X64"\r
+!IF "$(HOST_ARCH)"=="X64"\r
 ARCH_INCLUDE = $(SOURCE_PATH)\Include\X64\r
 BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win64\r
 LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win64\r

diff --git a/BaseTools/Source/C/Split/GNUmakefile b/BaseTools/Source/C/Split/GNUmakefile
index e38a01f8c13450098b6698d3c7eb843b2f13ba75..a42fe1a547456393ca6d7e9d8d9038d2aa37e558 100644 (file)
--- a/BaseTools/Source/C/Split/GNUmakefile
+++ b/BaseTools/Source/C/Split/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = Split\r

diff --git a/BaseTools/Source/C/TianoCompress/GNUmakefile b/BaseTools/Source/C/TianoCompress/GNUmakefile
index e4f3a69638bfce654bef1633d27f5b475f3656b7..403b3634ccda4589b99899a511b85b35f7bd53e8 100644 (file)
--- a/BaseTools/Source/C/TianoCompress/GNUmakefile
+++ b/BaseTools/Source/C/TianoCompress/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = TianoCompress\r

diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
index 2ebf3e04650b1a9e3d5f408498b344740ab38bdb..b9f8f8cbbdb6f648495b11ae8c49862df18c3404 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = VfrCompile\r

diff --git a/BaseTools/Source/C/VolInfo/GNUmakefile b/BaseTools/Source/C/VolInfo/GNUmakefile
index d5f115abed73d0b87741f0ec6b175d07ee57524a..86929c50c3333e15523f1916a45d263e7fd70ce8 100644 (file)
--- a/BaseTools/Source/C/VolInfo/GNUmakefile
+++ b/BaseTools/Source/C/VolInfo/GNUmakefile
@@ -10,7 +10,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
-ARCH ?= IA32\r
+HOST_ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = VolInfo\r