<Command.MSFT, Command.INTEL>\r
"$(CC)" /Fo${dst} $(DEPS_FLAGS) $(CC_FLAGS) $(INC) ${src}\r
\r
- <Command.GCC, Command.RVCT>\r
- # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues\r
+ <Command.GCC>\r
"$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) -c -o ${dst} $(INC) ${src}\r
\r
<Command.XCODE>\r
<OutputFile>\r
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
\r
- <Command.GCC, Command.RVCT>\r
+ <Command.GCC>\r
"$(CC)" $(CC_FLAGS) $(CC_XIPFLAGS) -c -o ${dst} $(INC) ${src}\r
\r
[C-Header-File]\r
<Command>\r
\r
[Assembly-Code-File.COMMON.COMMON]\r
- <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>\r
+ <InputFile.MSFT, InputFile.INTEL>\r
?.asm, ?.Asm, ?.ASM\r
\r
<InputFile.GCC>\r
Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii\r
"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iiii\r
\r
- <Command.GCC, Command.RVCT>\r
+ <Command.GCC>\r
Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src}\r
"$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.ii\r
Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii\r
- # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii\r
\r
[Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64]\r
# Remove --convert-hex for ARM as it breaks MSFT assemblers\r
- <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>\r
+ <InputFile.MSFT, InputFile.INTEL>\r
?.asm, ?.Asm, ?.ASM\r
\r
<InputFile.GCC>\r
Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii\r
"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iiii\r
\r
- <Command.GCC, Command.RVCT>\r
+ <Command.GCC>\r
Trim --asm-file -o ${d_path}(+)${s_base}.i -i $(INC_LIST) ${src}\r
"$(PP)" $(DEPS_FLAGS) $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.ii\r
Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iiii ${d_path}(+)${s_base}.ii\r
- # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iiii\r
\r
[Nasm-Assembly-Code-File.COMMON.COMMON]\r
$(RM) ${dst}\r
"$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)\r
\r
- <Command.RVCT>\r
- "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)\r
- \r
- <Command.RVCTCYGWIN>\r
- # $(OBJECT_FILES_LIST) has wrong paths for cygwin\r
- "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)\r
-\r
<Command.XCODE>\r
"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)\r
\r
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) $(DLINK2_FLAGS)\r
"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
\r
- <Command.RVCT>\r
- "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
-\r
- <Command.RVCTCYGWIN>\r
- #$(STATIC_LIBRARY_FILES_LIST) has wrong paths for cygwin\r
- "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)\r
-\r
<Command.XCODE>\r
"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
\r
<Command.GCC>\r
"$(DLINK)" $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(DLINK2_FLAGS)\r
\r
- <Command.RVCT>\r
- "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
-\r
- <Command.RVCTCYGWIN>\r
- #$(STATIC_LIBRARY_FILES_LIST) has the wrong paths for cygwin\r
- "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)\r
-\r
<Command.XCODE>\r
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
\r
$(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
$(OUTPUT_DIR)(+)$(MODULE_NAME).map\r
\r
- <Command.MSFT, Command.INTEL, Command.RVCT, Command.CLANGPDB>\r
+ <Command.MSFT, Command.INTEL, Command.CLANGPDB>\r
"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
$(CP) ${dst} $(DEBUG_DIR)\r
$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi\r
<OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC, OutputFile.CLANGPDB>\r
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib\r
\r
- <OutputFile.XCODE, OutputFile.RVCT>\r
+ <OutputFile.XCODE>\r
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc\r
\r
<Command.MSFT, Command.INTEL, Command.CLANGPDB>\r
<Command.GCC>\r
"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)\r
"$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}\r
- <Command.XCODE, Command.RVCT, Command.CLANGGCC>\r
+ <Command.XCODE, Command.CLANGGCC>\r
"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)\r
# Required to build platforms or ACPI tables:\r
# Intel(r) ACPI Compiler (iasl.exe) from\r
# https://acpica.org/downloads\r
-# RVCT -win- Requires:\r
-# ARM C/C++ Compiler, 5.00\r
-# Optional:\r
-# Required to build EBC drivers:\r
-# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)\r
-# Required to build platforms or ACPI tables:\r
-# Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
-# http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
-# Notes: Since this tool chain is obsolete, it doesn't enable the compiler option for included header file list generation,\r
-# and lose the incremental build capability.\r
-# RVCTLINUX -unix- Requires:\r
-# ARM C/C++ Compiler, 5.00\r
-# Optional:\r
-# Required to build platforms or ACPI tables:\r
-# Intel(r) ACPI Compiler from\r
-# https://acpica.org/downloads\r
-# Notes: Since this tool chain is obsolete, it doesn't enable the compiler option for included header file list generation,\r
-# and lose the incremental build capability.\r
# * Commented out - All versions of VS2005 use the same standard install directory\r
#\r
####################################################################################\r
# MSFT - Microsoft\r
# GCC - GNU GCC\r
# INTEL - INTEL\r
-# RVCT - ARM RealView Toolchain\r
####################################################################################\r
####################################################################################\r
#\r
NOOPT_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -g -gdwarf -O0 -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)\r
RELEASE_XCODE5_X64_CC_FLAGS = -target x86_64-pc-win32-macho -c -Os -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)\r
\r
-####################################################################################\r
-#\r
-# RVCT Common\r
-#\r
-####################################################################################\r
-\r
-DEFINE RVCT_ALL_ASM_FLAGS = --diag_suppress=1786 --diag_error=warning --apcs /interwork\r
-DEFINE RVCT_ALL_CC_FLAGS = --c90 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_suppress=186,188,1,111,68 --diag_warning 167 --diag_error=warning --diag_style=ide --protect_stack\r
-DEFINE RVCT_ALL_DLINK_FLAGS = --no_scanlib --no_exceptions --datacompressor off --strict --symbols --diag_style=ide --no_legacyalign --scatter $(EDK_TOOLS_PATH)/Scripts/Rvct-Align32.sct\r
-\r
-####################################################################################\r
-#\r
-# ARM RealView Tools - Windows\r
-#\r
-####################################################################################\r
-# RVCT - Tools from ARM\r
-\r
-*_RVCT_*_*_FAMILY = RVCT\r
-\r
-#\r
-# Use default values, or override in DSC file\r
-#\r
-*_RVCT_ARM_ARCHCC_FLAGS = --thumb --fpu=softvfp\r
-*_RVCT_ARM_ARCHASM_FLAGS =\r
-*_RVCT_ARM_ARCHDLINK_FLAGS =\r
-*_RVCT_ARM_PLATFORM_FLAGS = --cpu 7-A\r
-\r
- DEBUG_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-RELEASE_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-\r
-\r
-*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)\r
-*_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --preinclude AutoGen.h\r
-*_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(MODULE_NAME)StrDefs.h\r
-*_RVCT_ARM_MAKE_PATH = nmake /NOLOGO\r
-*_RVCT_ARM_SLINK_FLAGS = --partial -o\r
- DEBUG_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2\r
-\r
-##################\r
-# ARM definitions\r
-##################\r
-*_RVCT_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCT_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-*_RVCT_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-*_RVCT_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
-*_RVCT_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCT_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCT_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
-\r
-####################################################################################\r
-#\r
-# ARM RealView Tools - Linux\r
-#\r
-####################################################################################\r
-# RVCTLINUX - Tools from ARM in a Cygwin environment\r
-*_RVCTLINUX_*_*_FAMILY = RVCT\r
-*_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX\r
-\r
-*_RVCTLINUX_*_MAKE_PATH = make\r
-\r
-#\r
-# Use default values, or override in DSC file\r
-#\r
-*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb --fpu=softvfp\r
-*_RVCTLINUX_ARM_ARCHASM_FLAGS =\r
-*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =\r
-*_RVCTLINUX_ARM_PLATFORM_FLAGS = --cpu 7-A\r
-\r
-DEBUG_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-RELEASE_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-\r
-*_RVCTLINUX_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)\r
-*_RVCTLINUX_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
-*_RVCTLINUX_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(MODULE_NAME)StrDefs.h\r
-*_RVCTLINUX_ARM_SLINK_FLAGS = --partial -o\r
- DEBUG_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2\r
-\r
-##################\r
-# ARM definitions\r
-##################\r
-*_RVCTLINUX_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCTLINUX_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-*_RVCTLINUX_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
-*_RVCTLINUX_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
-*_RVCTLINUX_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCTLINUX_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCTLINUX_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
-\r
-####################################################################################\r
-#\r
-# ARM RealView Tools - Cygwin\r
-#\r
-####################################################################################\r
-# ARMCYGWIN - Tools from ARM in a Cygwin environment\r
-\r
-*_RVCTCYGWIN_*_*_FAMILY = RVCT\r
-*_RVCTCYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN\r
-\r
-*_RVCTCYGWIN_ARM_CCPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCTCYGWIN_ARM_SLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
-*_RVCTCYGWIN_ARM_DLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
-*_RVCTCYGWIN_ARM_ASMPATH_FLAG = ENV(RVCT_TOOLS_PATH)armasm\r
-*_RVCTCYGWIN_ARM_PPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
-*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG = ENV(RVCT_TOOLS_PATH)fromelf\r
-\r
-#\r
-# Use default values, or override in DSC file\r
-#\r
-*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb --fpu=softvfp\r
-*_RVCTCYGWIN_ARM_ARCHASM_FLAGS =\r
-*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =\r
-*_RVCTCYGWIN_ARM_PLATFORM_FLAGS = --cpu 7-A\r
-\r
- DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map`\r
-RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map`\r
-\r
-*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS)\r
-*_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
-*_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(MODULE_NAME)StrDefs.h`\r
-*_RVCTCYGWIN_ARM_MAKE_PATH = make\r
-*_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o\r
- DEBUG_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g\r
-RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=550 DEF(RVCT_ALL_CC_FLAGS) -O2\r
-\r
-##################\r
-# ARM definitions\r
-##################\r
-*_RVCTCYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-*_RVCTCYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-*_RVCTCYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-*_RVCTCYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-*_RVCTCYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-*_RVCTCYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-*_RVCTCYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
-\r
#################\r
# ASM 16 linker definitions\r
#################\r
## 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
@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
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
projects / mirror_edk2.git / commitdiff