          
 Index: BaseTools/Conf/tools_def.template
 ===================================================================
---- BaseTools/Conf/tools_def.template	(revision 12664)
+--- BaseTools/Conf/tools_def.template	(revision 12691)
 +++ BaseTools/Conf/tools_def.template	(working copy)
 @@ -467,6 +467,7 @@
  #   MSFT           - Microsoft

         self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)
Index: BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
===================================================================
--- BaseTools/Source/Python/Workspace/WorkspaceDatabase.py	(revision 12664)
+++ BaseTools/Source/Python/Workspace/WorkspaceDatabase.py	(working copy)
@@ -2319,7 +2319,7 @@
     # @param GlobalMacros       Global macros used for replacement during file parsing

Index: BaseTools/Conf/build_rule.template
===================================================================
--- BaseTools/Conf/build_rule.template	(revision 12691)
+++ BaseTools/Conf/build_rule.template	(working copy)
@@ -129,7 +129,7 @@
         "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
