Sync EDKII BaseTools to BaseTools project r1937.

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / AutoGen.py

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 4755e31e965af1a0f6836cf9e3ba15a7e84d83a3..fa434e810a520f850869a7b83c00ebdacbd5f877 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -138,7 +138,7 @@ class WorkspaceAutoGen(AutoGen):
     #   @param  SkuId                   SKU id from command line\r
     #\r
     def _Init(self, WorkspaceDir, ActivePlatform, Target, Toolchain, ArchList, MetaFileDb,\r
-              BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=[], Fvs=[], SkuId=''):\r
+              BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=[], Fvs=[], SkuId='', UniFlag=None):\r
         self.MetaFile       = ActivePlatform.MetaFile\r
         self.WorkspaceDir   = WorkspaceDir\r
         self.Platform       = ActivePlatform\r
@@ -146,6 +146,7 @@ class WorkspaceAutoGen(AutoGen):
         self.ToolChain      = Toolchain\r
         self.ArchList       = ArchList\r
         self.SkuId          = SkuId\r
+        self.UniFlag        = UniFlag\r
 \r
         self.BuildDatabase  = MetaFileDb\r
         self.TargetTxt      = BuildConfig\r
@@ -1191,6 +1192,13 @@ class PlatformAutoGen(AutoGen):
                         BuildOptions[Tool][Attr] = Value[1:]\r
                     else:\r
                         BuildOptions[Tool][Attr] += " " + Value\r
+        if Module.AutoGenVersion < 0x00010005 and self.Workspace.UniFlag != None:\r
+            #\r
+            # Override UNI flag only for EDK module.\r
+            #\r
+            if 'BUILD' not in BuildOptions:\r
+                BuildOptions['BUILD'] = {}\r
+            BuildOptions['BUILD']['FLAGS'] = self.Workspace.UniFlag\r
         return BuildOptions\r
 \r
     Platform            = property(_GetPlatform)\r