BaseTools: Remove RVCT support

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

diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index 368a31047e82af4e00be61753cbff7d8db1c079d..d05410b32966bfbeaf3e514f1a68ea72be90e873 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -32,7 +32,7 @@ import tempfile
 ## Mapping Makefile type\r
 gMakeTypeMap = {TAB_COMPILER_MSFT:"nmake", "GCC":"gmake"}\r
 #\r
-# Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC/RVCT\r
+# Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC\r
 # is the former use /I , the Latter used -I to specify include directories\r
 #\r
 gBuildOptIncludePatternMsft = re.compile(r"(?:.*?)/I[ \t]*([^ ]*)", re.MULTILINE | re.DOTALL)\r
@@ -684,12 +684,12 @@ class ModuleAutoGen(AutoGen):
     @cached_property\r
     def BuildOptionIncPathList(self):\r
         #\r
-        # Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC/RVCT\r
+        # Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC\r
         # is the former use /I , the Latter used -I to specify include directories\r
         #\r
         if self.PlatformInfo.ToolChainFamily in (TAB_COMPILER_MSFT):\r
             BuildOptIncludeRegEx = gBuildOptIncludePatternMsft\r
-        elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC', 'RVCT'):\r
+        elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC'):\r
             BuildOptIncludeRegEx = gBuildOptIncludePatternOther\r
         else:\r
             #\r
@@ -704,16 +704,7 @@ class ModuleAutoGen(AutoGen):
             except KeyError:\r
                 FlagOption = ''\r
 \r
-            if self.ToolChainFamily != 'RVCT':\r
-                IncPathList = [NormPath(Path, self.Macros) for Path in BuildOptIncludeRegEx.findall(FlagOption)]\r
-            else:\r
-                #\r
-                # RVCT may specify a list of directory seperated by commas\r
-                #\r
-                IncPathList = []\r
-                for Path in BuildOptIncludeRegEx.findall(FlagOption):\r
-                    PathList = GetSplitList(Path, TAB_COMMA_SPLIT)\r
-                    IncPathList.extend(NormPath(PathEntry, self.Macros) for PathEntry in PathList)\r
+            IncPathList = [NormPath(Path, self.Macros) for Path in BuildOptIncludeRegEx.findall(FlagOption)]\r
 \r
             #\r
             # EDK II modules must not reference header files outside of the packages they depend on or\r