1 files changed, 33 insertions, 22 deletions
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 52d32a9e98..9e7771dc7d 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -564,7 +564,17 @@ class FdfParser:
 
         self.Rewind()
 
-    
+    def __GetIfListCurrentItemStat(self, IfList):
+        if len(IfList) == 0:
+            return True
+        
+        for Item in IfList:
+            if Item[1] == False:
+                return False
+        
+        return True
+                   
+
     ## PreprocessConditionalStatement() method
     #
     #   Preprocess conditional statement.
@@ -577,27 +587,28 @@ class FdfParser:
         IfList = []
         while self.__GetNextToken():
             if self.__Token == 'DEFINE':
-                DefineLine = self.CurrentLineNumber - 1
-                DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')
-                if not self.__GetNextToken():
-                    raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)
-                Macro = self.__Token
-                if not self.__IsToken( "="):
-                    raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
-
-                if not self.__GetNextToken():
-                    raise Warning("expected value", self.FileName, self.CurrentLineNumber)
-
-                if self.__GetStringData():
-                    pass
-                Value = self.__Token
-                if not Macro in InputMacroDict:
-                    FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)
-                    MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])
-                    MacProfile.MacroName = Macro
-                    MacProfile.MacroValue = Value
-                    AllMacroList.append(MacProfile)
-                self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))
+                if self.__GetIfListCurrentItemStat(IfList):
+                    DefineLine = self.CurrentLineNumber - 1
+                    DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')
+                    if not self.__GetNextToken():
+                        raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)
+                    Macro = self.__Token
+                    if not self.__IsToken( "="):
+                        raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
+    
+                    if not self.__GetNextToken():
+                        raise Warning("expected value", self.FileName, self.CurrentLineNumber)
+    
+                    if self.__GetStringData():
+                        pass
+                    Value = self.__Token
+                    if not Macro in InputMacroDict:
+                        FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)
+                        MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])
+                        MacProfile.MacroName = Macro
+                        MacProfile.MacroValue = Value
+                        AllMacroList.append(MacProfile)
+                    self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))
 
             elif self.__Token in ('!ifdef', '!ifndef', '!if'):
                 IfStartPos = (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - len(self.__Token))