Sync BaseTools Trunk (version r2518) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / C / GNUmakefile

diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
index 3b370eb4cecddf8864eb5b1763fb0dbcf1c14cad..e0dde3e08507c1109ce0e8a1f8e5db6a24c8c1de 100644 (file)
--- a/BaseTools/Source/C/GNUmakefile
+++ b/BaseTools/Source/C/GNUmakefile
@@ -1,9 +1,9 @@
 ## @file
-#  GNU Make makefile for BaseTools/Source/C.
+#  GNU Make makefile for C tools build.
 #
-#  Copyright (c) 2007 - 2009, Intel Corporation
+#  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
 #
-#  All rights reserved. This program and the accompanying materials
+#  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
 #  http://opensource.org/licenses/bsd-license.php
@@ -22,10 +22,7 @@ ifndef ARCH
   ifeq ($(uname_m),x86_64)
     ARCH=X64
   endif
-  ifeq ($(uname_m),i386)
-    ARCH=IA32
-  endif
-  ifeq ($(uname_m),i686)
+  ifeq ($(patsubst i%86,IA32,$(uname_m)),IA32)
     ARCH=IA32
   endif
   ifndef ARCH
@@ -68,7 +65,7 @@ SUBDIRS := $(LIBRARIES) $(APPLICATIONS)
 
 .PHONY: outputdirs
 makerootdir:
-       -mkdir $(MAKEROOT)
+       -mkdir -p $(MAKEROOT)
 
 .PHONY: subdirs $(SUBDIRS)
 subdirs: $(SUBDIRS)