summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhijufan <zhijux.fan@intel.com>2018-10-24 09:08:39 +0800
committerYonghong Zhu <yonghong.zhu@intel.com>2018-10-25 16:43:00 +0800
commit5061efe70d020a6811788de2408531f661ef1e45 (patch)
tree4d75e9a16899460e4f406d7d381839e2d3b94d69
parentebed920ffddf1a7de779be3f956415f4160de60d (diff)
downloadedk2-5061efe70d020a6811788de2408531f661ef1e45.tar.gz
edk2-5061efe70d020a6811788de2408531f661ef1e45.tar.xz
edk2-5061efe70d020a6811788de2408531f661ef1e45.zip
BaseTools: list .nasm include inc files as its dependency
.nasm source file may include some header files. header file should be listed in Makefile as .nasm source file dependency. But now, BaseTools doesn't find them and list them in Makefile. This is a missing, because original ASM file supports it. Cc: Liming Gao <liming.gao@intel.com> Cc: Yonghong Zhu <yonghong.zhu@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--BaseTools/Source/Python/AutoGen/GenMake.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index b4377eef17..d94d8f9368 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -30,7 +30,7 @@ from collections import OrderedDict
from Common.DataType import TAB_COMPILER_MSFT
## Regular expression for finding header file inclusions
-gIncludePattern = re.compile(r"^[ \t]*#?[ \t]*include(?:[ \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[\"<]?[ \t]*)([-\w.\\/() \t]+)(?:[ \t]*[\">]?\)?)", re.MULTILINE | re.UNICODE | re.IGNORECASE)
+gIncludePattern = re.compile(r"^[ \t]*[#%]?[ \t]*include(?:[ \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[\"<]?[ \t]*)([-\w.\\/() \t]+)(?:[ \t]*[\">]?\)?)", re.MULTILINE | re.UNICODE | re.IGNORECASE)
## Regular expression for matching macro used in header file inclusion
gMacroPattern = re.compile("([_A-Z][_A-Z0-9]*)[ \t]*\((.+)\)", re.UNICODE)