X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FGenFds%2FGenFdsGlobalVariable.py;h=04bbc300ceda186a13e9fd8ba5c47188fbe470dc;hb=aaf8aa7b2cd6e5ee533aa622d72391226069e0c3;hp=f97b41b834eb6da24077319ca2a15ecb7aa4e050;hpb=1be2ed90a20618d71ddf34b8a07d038da0b36854;p=mirror_edk2.git

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index f97b41b834..04bbc300ce 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -45,6 +45,7 @@ class GenFdsGlobalVariable:
     LibDir = ''
     WorkSpace = None
     WorkSpaceDir = ''
+    ConfDir = ''
     EdkSourceDir = ''
     OutputDirFromDscDict = {}
     TargetName = ''
@@ -88,7 +89,7 @@ class GenFdsGlobalVariable:
     def __LoadBuildRule():
         if GenFdsGlobalVariable.__BuildRuleDatabase:
             return GenFdsGlobalVariable.__BuildRuleDatabase
-        BuildConfigurationFile = os.path.normpath(os.path.join(GenFdsGlobalVariable.WorkSpaceDir, "Conf/target.txt"))
+        BuildConfigurationFile = os.path.normpath(os.path.join(GenFdsGlobalVariable.ConfDir, "target.txt"))
         TargetTxt = TargetTxtClassObject()
         if os.path.isfile(BuildConfigurationFile) == True:
             TargetTxt.LoadTargetTxtFile(BuildConfigurationFile)
@@ -201,11 +202,13 @@ class GenFdsGlobalVariable:
 
         TargetList = set()
         FileList = []
-        for File in Inf.Sources:
-            if File.TagName in ("", "*", GenFdsGlobalVariable.ToolChainTag) and \
-                File.ToolChainFamily in ("", "*", GenFdsGlobalVariable.ToolChainFamily):
-                FileList.append((File, DataType.TAB_UNKNOWN_FILE))
-        
+
+        if not Inf.IsBinaryModule:
+            for File in Inf.Sources:
+                if File.TagName in ("", "*", GenFdsGlobalVariable.ToolChainTag) and \
+                    File.ToolChainFamily in ("", "*", GenFdsGlobalVariable.ToolChainFamily):
+                    FileList.append((File, DataType.TAB_UNKNOWN_FILE))
+
         for File in Inf.Binaries:
             if File.Target in ['COMMON', '*', GenFdsGlobalVariable.TargetName]:
                 FileList.append((File, File.Type))
@@ -645,7 +648,8 @@ class GenFdsGlobalVariable:
                 '$(EDK_SOURCE)'  : GenFdsGlobalVariable.EdkSourceDir,
 #                '$(OUTPUT_DIRECTORY)': GenFdsGlobalVariable.OutputDirFromDsc,
                 '$(TARGET)' : GenFdsGlobalVariable.TargetName,
-                '$(TOOL_CHAIN_TAG)' : GenFdsGlobalVariable.ToolChainTag
+                '$(TOOL_CHAIN_TAG)' : GenFdsGlobalVariable.ToolChainTag,
+                '$(SPACE)' : ' '
                }
         OutputDir = GenFdsGlobalVariable.OutputDirFromDscDict[GenFdsGlobalVariable.ArchList[0]]
         if Arch != 'COMMON' and Arch in GenFdsGlobalVariable.ArchList: