From 01018cf928376c099cc2a7a52ea56b697c895da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 20 May 2018 11:03:33 +0200
Subject: strlwr redeclared


diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h
index dccb192..53ff817 100644
--- a/BaseTools/Source/C/Common/CommonLib.h
+++ b/BaseTools/Source/C/Common/CommonLib.h
@@ -474,9 +474,11 @@ Returns:
 #define strcmpi strcasecmp
 size_t _filelength(int fd);
 #ifndef __CYGWIN__
+#ifndef __HAIKU__
 char *strlwr(char *s);
 #endif
 #endif
+#endif
 
 //
 // On windows, mkdir only has one parameter.
-- 
2.16.2


From 20624f52f58bffbbfae989a00ac3d6b6b4fc7bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 20 May 2018 11:06:15 +0200
Subject: Build conf parametrisation


diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index e5c31fe..032318a 100644
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -23,7 +23,7 @@
 #                                               build. This line is required if and only if the current
 #                                               working directory does not contain one or more description
 #                                               files.
-ACTIVE_PLATFORM       = Nt32Pkg/Nt32Pkg.dsc
+ACTIVE_PLATFORM       = @ACTIVE_PLATFORM@
 
 #  TARGET                List       Optional    Zero or more of the following: DEBUG, RELEASE, NOOPT
 #                                               UserDefined; separated by a space character.
@@ -31,7 +31,7 @@ ACTIVE_PLATFORM       = Nt32Pkg/Nt32Pkg.dsc
 #                                               valid targets specified in the platform description file 
 #                                               will attempt to be built. The following line will build 
 #                                               DEBUG platform target.
-TARGET                = DEBUG
+TARGET                = @TARGET@
 
 #  TARGET_ARCH           List       Optional    What kind of architecture is the binary being target for.
 #                                               One, or more, of the following, IA32, IPF, X64, EBC, ARM
@@ -47,7 +47,7 @@ TARGET                = DEBUG
 #                                               If not specified, then all valid architectures specified
 #                                               in the platform file, for which tools are available, will be
 #                                               built.
-TARGET_ARCH           = IA32
+TARGET_ARCH           = @TARGET_ARCH@
 
 #  TOOL_DEFINITION_FILE  Filename  Optional   Specify the name of the filename to use for specifying
 #                                             the tools to use for the build.  If not specified,
@@ -57,7 +57,7 @@ TOOL_CHAIN_CONF       = Conf/tools_def.txt
 #  TAGNAME               List      Optional   Specify the name(s) of the tools_def.txt TagName to use.
 #                                             If not specified, all applicable TagName tools will be
 #                                             used for the build.  The list uses space character separation.
-TOOL_CHAIN_TAG        = MYTOOLS
+TOOL_CHAIN_TAG        = @TOOL_CHAIN_TAG@
 
 # MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. If not specified or set
 #                                                 to zero, tool automatically detect number of processor
-- 
2.16.2

