Sync BaseTool trunk (version r2599) into EDKII BaseTools.

[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 96b3d15e8ae2031ef8ef814ffb4bb4fcd8a42bb6..6895f98c6ee6a8b15a048c17f028b66b6f45b88e 100644 (file)
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -4,6 +4,7 @@
 # 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
 #\r
 # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
@@ -34,24 +35,29 @@ ifeq ($(ARCH), X64)
 ARCH_INCLUDE = -I $(MAKEROOT)/Include/X64/\r
 endif\r
 \r
+ifeq ($(ARCH), ARM)\r
+ARCH_INCLUDE = -I $(MAKEROOT)/Include/Arm/\r
+endif\r
+\r
 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) \r
 CPPFLAGS = $(INCLUDE)\r
 CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fno-merge-constants -nostdlib -Wall -Werror -c -g\r
 LFLAGS =\r
 \r
+ifeq ($(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\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
+#  so only do this is uname -m returns i386.\r
 #\r
 uname_s = $(shell uname -s)\r
-uname_m = $(shell uname -m)\r
 ifeq ($(uname_s),Darwin)\r
-ifeq ($(uname_m),i386)\r
   CFLAGS   += -arch i386\r
   CPPFLAGS += -arch i386\r
   LFLAGS   += -arch i386\r
 endif\r
 endif\r
+\r
   \r
 .PHONY: all\r
 .PHONY: install\r