BaseTools/DevicePath: fix GCC build error in print_mem(), and clean it up

[mirror_edk2.git] / BaseTools / Source / C / Makefiles / header.makefile

diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 821d114e78d254fd8772fc8d2ae7728ecfb72a72..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
@@ -52,9 +52,9 @@ else
 BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g\r
 endif\r
 BUILD_LFLAGS =\r
-BUILD_CXXFLAGS =\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