BaseTools: Actually plug in BaseTools build on AArch64

[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 9aa83c03901aa26aa272496649811e285be4a926..6a759d94c7a6c04950ec670d2436b286b8825591 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,9 +35,22 @@ 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
+ifeq ($(ARCH), AARCH64)\r
+ARCH_INCLUDE = -I $(MAKEROOT)/Include/AArch64/\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
+ifeq ($(DARWIN),Darwin)\r
+# assume clang or clang compatible flags on OS X\r
+CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -nostdlib -c -g\r
+else\r
+CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -nostdlib -c -g\r
+endif\r
 LFLAGS =\r
 \r
 ifeq ($(ARCH), IA32)\r
@@ -45,8 +59,7 @@ ifeq ($(ARCH), IA32)
 #  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
-ifeq ($(uname_s),Darwin)\r
+ifeq ($(DARWIN),Darwin)\r
   CFLAGS   += -arch i386\r
   CPPFLAGS += -arch i386\r
   LFLAGS   += -arch i386\r