1 files changed, 41 insertions, 23 deletions
diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
index 723b9405bf..363c38302b 100644
--- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py
+++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
@@ -10,7 +10,7 @@
 #
 from __future__ import print_function
 from __future__ import absolute_import
-from Common.buildoptions import BuildOption,BuildTarget
+
 import Common.GlobalData as GlobalData
 import Common.LongFilePathOs as os
 from . import EdkLogger
@@ -144,29 +144,47 @@ class TargetTxtClassObject(object):
 #
 # @retval Target An instance of TargetTxtClassObject() with loaded target.txt
 #
-def TargetTxtDict():
-    Target = TargetTxtClassObject()
-    if BuildOption.ConfDirectory:
-        # Get alternate Conf location, if it is absolute, then just use the absolute directory name
-        ConfDirectoryPath = os.path.normpath(BuildOption.ConfDirectory)
-
-        if not os.path.isabs(ConfDirectoryPath):
-            # Since alternate directory name is not absolute, the alternate directory is located within the WORKSPACE
-            # This also handles someone specifying the Conf directory in the workspace. Using --conf=Conf
-            ConfDirectoryPath = mws.join(os.environ["WORKSPACE"], ConfDirectoryPath)
-    else:
-        if "CONF_PATH" in os.environ:
-            ConfDirectoryPath = os.path.normcase(os.path.normpath(os.environ["CONF_PATH"]))
+
+class TargetTxtDict():
+
+    def __new__(cls, *args, **kw):
+        if not hasattr(cls, '_instance'):
+            orig = super(TargetTxtDict, cls)
+            cls._instance = orig.__new__(cls, *args, **kw)
+        return cls._instance
+
+    def __init__(self):
+        if not hasattr(self, 'Target'):
+            self.TxtTarget = None
+
+    @property
+    def Target(self):
+        if not self.TxtTarget:
+            self._GetTarget()
+        return self.TxtTarget
+
+    def _GetTarget(self):
+        Target = TargetTxtClassObject()
+        ConfDirectory = GlobalData.gCmdConfDir
+        if ConfDirectory:
+            # Get alternate Conf location, if it is absolute, then just use the absolute directory name
+            ConfDirectoryPath = os.path.normpath(ConfDirectory)
+
+            if not os.path.isabs(ConfDirectoryPath):
+                # Since alternate directory name is not absolute, the alternate directory is located within the WORKSPACE
+                # This also handles someone specifying the Conf directory in the workspace. Using --conf=Conf
+                ConfDirectoryPath = mws.join(os.environ["WORKSPACE"], ConfDirectoryPath)
         else:
-            # Get standard WORKSPACE/Conf use the absolute path to the WORKSPACE/Conf
-            ConfDirectoryPath = mws.join(os.environ["WORKSPACE"], 'Conf')
-    GlobalData.gConfDirectory = ConfDirectoryPath
-    targettxt = os.path.normpath(os.path.join(ConfDirectoryPath, gDefaultTargetTxtFile))
-    if os.path.exists(targettxt):
-        Target.LoadTargetTxtFile(targettxt)
-    return Target
-
-TargetTxt = TargetTxtDict()
+            if "CONF_PATH" in os.environ:
+                ConfDirectoryPath = os.path.normcase(os.path.normpath(os.environ["CONF_PATH"]))
+            else:
+                # Get standard WORKSPACE/Conf use the absolute path to the WORKSPACE/Conf
+                ConfDirectoryPath = mws.join(os.environ["WORKSPACE"], 'Conf')
+        GlobalData.gConfDirectory = ConfDirectoryPath
+        targettxt = os.path.normpath(os.path.join(ConfDirectoryPath, gDefaultTargetTxtFile))
+        if os.path.exists(targettxt):
+            Target.LoadTargetTxtFile(targettxt)
+        self.TxtTarget = Target
 
 ##
 #